Merge pull request #693 from KovalevAndrey/1.x-update-compose-kotlin

Update compose version and kotlin

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - uses: gradle/wrapper-validation-action@v2
       - uses: gradle/actions/setup-gradle@v3
         with:
@@ -81,7 +81,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - uses: gradle/wrapper-validation-action@v2
       - uses: gradle/actions/setup-gradle@v3
         with:

.github/workflows/post_merge.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - uses: gradle/wrapper-validation-action@v2
       - uses: gradle/actions/setup-gradle@v3
         with:

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - uses: gradle/wrapper-validation-action@v2
       - uses: gradle/actions/setup-gradle@v3
         env:

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## Pending changes
 
---
+- [#693](https://github.com/bumble-tech/appyx/pull/693) – **Updated**: Compose BOM version and kotlin version
+
+---
 
 ## 1.4.1-migrate-2.x
 

build.gradle.kts

@@ -32,12 +32,37 @@ dependencyAnalysis {
                     // Needed for compose '@Preview'. The annotation is actually within
                     // androidx.compose.ui:ui-tooling-preview, hence the need to exclude.
                     "androidx.compose.ui:ui-tooling",
+                    "androidx.test.ext:junit",
 
                     // This is used to add the testing activity to the debug manifest
                     // However since not code is referenced, it is raised as unused.
-                    ":libraries:testing-ui-activity"
+                    ":libraries:testing-ui-activity",
+                    ":libraries:testing-ui"
                 )
             }
+            onRuntimeOnly {
+                exclude("org.jetbrains.kotlinx:kotlinx-coroutines-android")
+            }
+        }
+        project(":libraries:interop-ribs") {
+            onAny {
+                severity("ignore")
+            }
+        }
+        project(":samples:app") {
+            onAny {
+                severity("ignore")
+            }
+        }
+        project(":samples:navigation-compose") {
+            onAny {
+                severity("ignore")
+            }
+        }
+        project(":samples:sandbox") {
+            onAny {
+                severity("ignore")
+            }
         }
         project(":libraries:testing-junit4") {
             onUnusedDependencies {

gradle.properties

@@ -4,3 +4,4 @@ org.gradle.parallel=true
 android.useAndroidX=true
 kotlin.code.style=official
 library.version=1.4.1-migrate-2.x
+android.experimental.lint.version=8.3.0

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 # keep sorted please, use Edit -> Sort Lines
 
 [versions]
-androidCompileSdk = "33"
+androidCompileSdk = "34"
 androidMinSdk = "21"
-androidTargetSdk = "32"
+androidTargetSdk = "34"
 accompanist = "0.28.0"
 androidx-lifecycle = "2.6.1"
 androidx-navigation-compose = "2.5.1"
 coil = "2.2.1"
-composeBom = "2023.05.01"
-composeCompiler = "1.4.4"
+composeBom = "2024.04.00"
+composeCompiler = "1.5.11"
 ribs = "0.39.0"
 mvicore = "1.2.6"
 coroutines = "1.6.4"
-kotlin = "1.8.10"
+kotlin = "1.9.23"
 junit5 = "5.8.2"
 detekt = "1.22.0"
-dependencyAnalysis = "1.13.1"
+dependencyAnalysis = "1.31.0"
 
 [libraries]
 androidx-activity-compose = "androidx.activity:activity-compose:1.7.2"
@@ -74,7 +74,7 @@ junit-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref
 
 plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
-plugin-android = "com.android.tools.build:gradle:7.4.2"
+plugin-android = "com.android.tools.build:gradle:8.2.2"
 
 detekt-compose = "io.nlopez.compose.rules:detekt:0.1.5"
 toolargetool = "com.gu.android:toolargetool:0.3.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

libraries/core/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -19,6 +21,14 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
     }
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()

libraries/core/lint-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.1.3" type="baseline" client="gradle" dependencies="false" name="AGP (7.1.3)" variant="all" version="7.1.3">
+<issues format="6" by="lint 8.3.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.2)" variant="all" version="8.3.0">
 
     <issue
         id="ComposableNaming"
@@ -8,7 +8,7 @@
         errorLine2="                      ~~~~~~~~">
         <location
             file="src/main/kotlin/com/bumble/appyx/core/composable/Children.kt"
-            line="90"
+            line="92"
             column="23"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                      ~~~~~~~~">
         <location
             file="src/main/kotlin/com/bumble/appyx/core/composable/Children.kt"
-            line="102"
+            line="104"
             column="23"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                              ~~~~~~~~~">
         <location
             file="src/main/kotlin/com/bumble/appyx/core/composable/Children.kt"
-            line="118"
+            line="120"
             column="31"/>
     </issue>
 

libraries/customisations/build.gradle.kts

@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.config.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+
 plugins {
     id("java-library")
     id("kotlin")
@@ -6,8 +9,12 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+tasks.withType(KotlinJvmCompile::class.java).configureEach {
+    kotlinOptions.jvmTarget = JvmTarget.JVM_11.toString()
 }
 
 tasks.test {

libraries/interop-ribs/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -23,6 +25,13 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
+    }
 }
 
 dependencies {

libraries/interop-rx2/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -21,6 +23,13 @@ android {
             it.useJUnitPlatform()
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
+    }
 }
 
 dependencies {

libraries/interop-rx2/src/main/kotlin/com/bumble/appyx/interop/rx2/connectable/NodeConnector.kt

@@ -6,7 +6,7 @@ import com.jakewharton.rxrelay2.PublishRelay
 import com.jakewharton.rxrelay2.Relay
 import io.reactivex.Observer
 
-class NodeConnector<Input, Output>(
+class NodeConnector<Input, Output: Any>(
     override val input: Relay<Input> = PublishRelay.create(),
 ) : Connectable<Input, Output> {
 

libraries/interop-rx3/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -21,6 +23,13 @@ android {
             it.useJUnitPlatform()
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
+    }
 }
 
 dependencies {

libraries/testing-junit4/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -22,6 +24,13 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
+    }
 }
 
 dependencies {

libraries/testing-junit5/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -27,6 +29,13 @@ android {
             excludes += setOf("META-INF/LICENSE.md", "META-INF/LICENSE-notice.md")
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
+    }
 }
 
 dependencies {

libraries/testing-ui-activity/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -20,6 +22,13 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
+    }
 }
 
 dependencies {

libraries/testing-ui/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -22,6 +24,13 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
+    }
 }
 
 dependencies {

libraries/testing-unit-common/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.config.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -22,6 +24,13 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JvmTarget.JVM_11.toString()
+    }
 }
 
 dependencies {