Merge pull request #27 from iamjosephmj/develop

compose rc2 migration.
iamjosephmj · Jul 18, 2021 · 5450398 · 5450398
2 parents 47e9b96 + 94ddd05
commit 5450398
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Add the following to your project's build.gradle file
 
 ```groovy
 dependencies {
-    implementation 'com.github.iamjosephmj:flinger:1.0.4'
+    implementation 'com.github.iamjosephmj:flinger:1.0.5'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "io.iamjosephmj.flinger"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -39,20 +39,19 @@ android {
 
     composeOptions {
         kotlinCompilerVersion = "1.5.10"
-        kotlinCompilerExtensionVersion = "1.0.0-rc01"
+        kotlinCompilerExtensionVersion = "1.0.0-rc02"
     }
 }
 
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
-
-    implementation("androidx.compose.compiler:compiler:1.0.0-rc01")
-    implementation "androidx.navigation:navigation-compose:2.4.0-alpha03"
-    implementation 'androidx.compose.ui:ui:1.0.0-rc01'
-    implementation 'androidx.compose.material:material:1.0.0-rc01'
-    implementation 'com.github.iamjosephmj:flinger:1.0.4'
+    implementation 'com.google.android.material:material:1.4.0'
 
+    implementation("androidx.compose.compiler:compiler:1.0.0-rc02")
+    implementation "androidx.navigation:navigation-compose:2.4.0-alpha04"
+    implementation 'androidx.compose.ui:ui:1.0.0-rc02'
+    implementation 'androidx.compose.material:material:1.0.0-rc02'
+    implementation project(path: ':flinger')
 }
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
     dependencies {
         //noinspection AndroidGradlePluginVersion
-        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/flinger/build.gradle b/flinger/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -38,7 +38,7 @@ android {
 
     composeOptions {
         kotlinCompilerVersion = "1.5.10"
-        kotlinCompilerExtensionVersion = "1.0.0-rc01"
+        kotlinCompilerExtensionVersion = "1.0.0-rc02"
     }
 
     testOptions {
@@ -47,9 +47,9 @@ android {
 }
 
 dependencies {
-    implementation("androidx.compose.compiler:compiler:1.0.0-rc01")
-    implementation 'androidx.compose.ui:ui:1.0.0-rc01'
-    implementation 'androidx.compose.material:material:1.0.0-rc01'
+    implementation("androidx.compose.compiler:compiler:1.0.0-rc02")
+    implementation 'androidx.compose.ui:ui:1.0.0-rc02'
+    implementation 'androidx.compose.material:material:1.0.0-rc02'
 
     // Required -- JUnit 4 framework
     testImplementation("junit:junit:4.13.2")
@@ -73,7 +73,7 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'io.iamjosephmj.flinger'
                 artifactId = 'release'
-                version = '1.0.4'
+                version = '1.0.5'
             }
             // Creates a Maven publication called “debug”.
             debug(MavenPublication) {
@@ -82,7 +82,7 @@ afterEvaluate {
 
                 groupId = 'io.iamjosephmj.flinger'
                 artifactId = 'release'
-                version = '1.0.4'
+                version = '1.0.5'
             }
         }
     }