Updated Compose to 1.1.0-rc01 and Kotlin to 1.6.10

CHANGELOG.md

@@ -1,6 +1,12 @@
 Change Log
 ===========
 
+Version 1.1.0-rc01 *(2022-01-23)*
+----------------------------
+
+* Updated to Compose 1.1.0-rc01
+* Updated to Kotlin 1.6.10
+
 Version 1.0.5 *(2021-11-11)*
 ----------------------------
 

README.md

@@ -55,6 +55,6 @@ To see this in practice, please take a look at the [sample](sample) directory.
 This library is available on Maven, you can add it to your project using the following gradle dependencies:
 
 ```gradle
-implementation 'net.lachlanmckee:hilt-compose-navigation-factory:1.0.5'
-annotationProcessor 'net.lachlanmckee:hilt-compose-navigation-factory-compiler:1.0.5'
+implementation 'net.lachlanmckee:hilt-compose-navigation-factory:1.1.0-rc01'
+annotationProcessor 'net.lachlanmckee:hilt-compose-navigation-factory-compiler:1.1.0-rc01'
 ```

build.gradle.kts

@@ -97,7 +97,6 @@ subprojects {
   tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
       jvmTarget = "1.8"
-      useIR = true
       freeCompilerArgs = freeCompilerArgs + listOf(
         "-Xopt-in=kotlin.ExperimentalStdlibApi",
         "-Xopt-in=kotlin.RequiresOptIn",

gradle.properties

@@ -26,7 +26,7 @@ kotlin.code.style=official
 
 # Maven
 GROUP=net.lachlanmckee
-VERSION_NAME=1.0.5
+VERSION_NAME=1.1.0-rc01
 
 POM_DESCRIPTION=Provides a mechanism to scale Jetpack Compose navigation across numerous modules.
 POM_INCEPTION_YEAR=2021

gradle/libs.versions.toml

@@ -1,7 +1,8 @@
 [versions]
-compose = "1.0.5"
-dagger = "2.40.1"
-kotlin = "1.5.31"
+compose = "1.1.0-rc01"
+composeCompiler = "1.1.0-rc02"
+dagger = "2.40.5"
+kotlin = "1.6.10"
 autoService = "1.0.1"
 incap = "0.3"
 javapoet = "1.13.0"
@@ -10,46 +11,46 @@ androidXTest = "1.4.0"
 compileSdk = "31"
 minSdk = "21"
 targetSdk = "30"
-spotless = "6.0.0"
-dependencyUpdates = "0.39.0"
+spotless = "6.2.0"
+dependencyUpdates = "0.41.0"
 
 [plugins]
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 dependencyUpdates = { id = "com.github.ben-manes.versions", version.ref = "dependencyUpdates" }
 
 [libraries]
 androidx-activityCompose = "androidx.activity:activity-compose:1.4.0"
-androidx-appcompat = "androidx.appcompat:appcompat:1.3.1"
+androidx-appcompat = "androidx.appcompat:appcompat:1.4.1"
 androidx-lifecycle-livedata = "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
 
 compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
 compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "compose" }
-compose-navigation = "androidx.navigation:navigation-compose:2.4.0-beta02"
+compose-navigation = "androidx.navigation:navigation-compose:2.4.0-rc01"
 
 dagger-runtime = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 dagger-hilt-runtime = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }
 dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" }
-dagger-hilt-navigationCompose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03"
+dagger-hilt-navigationCompose = "androidx.hilt:hilt-navigation-compose:1.0.0-rc01"
 
 incap-compiler = { module = "net.ltgt.gradle.incap:incap-processor", version.ref = "incap" }
 incap-core = { module = "net.ltgt.gradle.incap:incap", version.ref = "incap" }
 javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" }
-auto-common = "com.google.auto:auto-common:1.2"
+auto-common = "com.google.auto:auto-common:1.2.1"
 auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" }
 auto-service-compiler = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }
 
 # Espresso testing
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 espresso-runner = { module = "androidx.test:runner", version.ref = "androidXTest" }
 espresso-rules = { module = "androidx.test:rules", version.ref = "androidXTest" }
-espresso-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidXTest" }
+espresso-orchestrator = "androidx.test:orchestrator:1.4.1"
 compose-testing = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
 
 # Gradle plugins
-plugin-androidTools = "com.android.tools.build:gradle:7.0.3"
+plugin-androidTools = "com.android.tools.build:gradle:7.0.4"
 plugin-hiltAndroidGradle = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "dagger" }
 plugin-kotlinGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 plugin-mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.18.0"

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-7.3.3-all.zip

library/build.gradle.kts

@@ -23,13 +23,11 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.get()
+    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
 }
 
 dependencies {
-  implementation(libs.androidx.activityCompose)
-  implementation(libs.compose.navigation)
   implementation(libs.dagger.hilt.navigationCompose)
   kapt(libs.bundles.daggerCompilers)
 }

sample/app/build.gradle.kts

@@ -29,7 +29,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.get()
+    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
 
   buildTypes {

sample/features/feature1/build.gradle.kts

@@ -22,7 +22,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.get()
+    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
 }
 

sample/features/feature2/build.gradle.kts

@@ -22,7 +22,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.get()
+    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
 }