Version bumps: compose, kotlin, AGP, etc.

popovanton0 · Jan 24, 2024 · cfe24bb · cfe24bb
1 parent 32436bd
commit cfe24bb
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 23 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/README.md b/README.md
@@ -131,8 +131,8 @@ Also, you can disable all the overhead of this library in your release builds by
 2. Using the `no-op` version of the library:
     ```kotlin
     dependencies {
-        debugImplementation("com.github.popovanton0.blueprint:blueprint:1.0.0-alpha04")
-        releaseImplementation("com.github.popovanton0.blueprint:blueprint-no-op:1.0.0-alpha04")
+        debugImplementation("com.github.popovanton0.blueprint:blueprint:1.0.0-alpha05")
+        releaseImplementation("com.github.popovanton0.blueprint:blueprint-no-op:1.0.0-alpha05")
     }
    ```
 
@@ -155,7 +155,7 @@ Next, add the dependency below to your _module_'s `build.gradle` file:
 
 ```gradle
 dependencies {
-    implementation "com.github.popovanton0.blueprint:blueprint:1.0.0-alpha04"
+    implementation "com.github.popovanton0.blueprint:blueprint:1.0.0-alpha05"
 }
 ```
 
@@ -180,15 +180,15 @@ Next, add the dependency below to your _module_'s `build.gradle.kts` file:
 
 ```kotlin
 dependencies {
-    implementation("com.github.popovanton0.blueprint:blueprint:1.0.0-alpha04")
+    implementation("com.github.popovanton0.blueprint:blueprint:1.0.0-alpha05")
 }
 ```
 
 Or using Gradle Version Catalog:
 
 ```toml
 [versions]
-blueprint = "1.0.0-alpha04"
+blueprint = "1.0.0-alpha05"
 
 [libraries]
 blueprint = { module = "com.github.popovanton0.blueprint:blueprint", version.ref = "blueprint" }
@@ -197,7 +197,7 @@ blueprint = { module = "com.github.popovanton0.blueprint:blueprint", version.ref
 </details>
 
 > [!WARNING]
-> Do not use this dependency notation: `com.github.popovanton0:blueprint:1.0.0-alpha04`.
+> Do not use this dependency notation: `com.github.popovanton0:blueprint:1.0.0-alpha05`.
 > It doesn't work!
 
 ### Licence

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 android {
     namespace = "com.popovanton0.blueprint.app"
-    compileSdk = 34
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.popovanton0.blueprint.app"

diff --git a/blueprint-no-op/build.gradle.kts b/blueprint-no-op/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 
 android {
     namespace = "com.popovanton0.blueprint"
-    compileSdk = 33
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         minSdk = 21
@@ -70,7 +70,7 @@ publishing {
         register<MavenPublication>("release") {
             groupId = "com.popovanton0.blueprint"
             artifactId = "blueprint-no-op"
-            version = "1.0.0-alpha04"
+            version = libs.versions.blueprint.get()
 
             afterEvaluate {
                 from(components["release"])

diff --git a/blueprint/build.gradle.kts b/blueprint/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 
 android {
     namespace = "com.popovanton0.blueprint"
-    compileSdk = 33
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         minSdk = 21
@@ -73,7 +73,7 @@ publishing {
         register<MavenPublication>("release") {
             groupId = "com.popovanton0.blueprint"
             artifactId = "blueprint"
-            version = "1.0.0-alpha04"
+            version = libs.versions.blueprint.get()
 
             afterEvaluate {
                 from(components["release"])

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,4 +4,29 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.paparazzi) apply false
     alias(libs.plugins.androidx.benchmark) apply false
+}
+
+subprojects {
+    plugins.withId("app.cash.paparazzi") {
+        // Defer until afterEvaluate so that testImplementation is created by Android plugin.
+        afterEvaluate {
+            dependencies.constraints {
+                add("testImplementation", "com.google.guava:guava") {
+                    attributes {
+                        attribute(
+                            TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
+                            objects.named(
+                                TargetJvmEnvironment::class,
+                                TargetJvmEnvironment.STANDARD_JVM
+                            )
+                        )
+                    }
+                    because(
+                        "LayoutLib and sdk-common depend on Guava's -jre published variant." +
+                                "See https://github.com/cashapp/paparazzi/issues/906."
+                    )
+                }
+            }
+        }
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,24 @@
 [versions]
-gradlePlugin = "8.2.0"
-kotlin = "1.9.21"
-compose = "1.5.4"
-composeCompiler = "1.5.6"
-paparazzi = "1.3.1"
+blueprint = "1.0.0-alpha05"
+compileSdk = "34"
+gradlePlugin = "8.2.2"
+kotlin = "1.9.22"
+compose = "1.6.0"
+composeCompiler = "1.5.8"
+paparazzi = "1.3.2"
 junit = "4.13.2"
 testParameterInjector = "1.12"
 equalsverifier = "3.14.2"
 androidxTestJunit = "1.1.5"
 androidxCoreKtx = "1.12.0"
-lifecycleRuntimeKtx = "2.6.2"
-androidxActivityCompose = "1.8.1"
-androidx-benchmark = "1.2.2"
+lifecycleRuntimeKtx = "2.7.0"
+androidxActivityCompose = "1.8.2"
+androidx-benchmark = "1.2.3"
 test-runner = "1.5.2"
 test-rules = "1.5.0"
-benchmark-junit4 = "1.2.2"
-uiAndroidStubs = "1.5.4"
-androidxAnnotation = "1.7.0"
+benchmark-junit4 = "1.2.3"
+uiAndroidStubs = "1.6.0"
+androidxAnnotation = "1.7.1"
 composeMaterial = "1.1.2"
 binaryCompatibility = "0.13.2"