Merge pull request #95 from GetStream/bump/10.11

Bump Compose UI/compiler, Kotlin, and several dependencies

.github/workflows/android.yml

@@ -15,7 +15,8 @@ jobs:
       - name: set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          distribution: adopt
+          java-version: 17
 
       - name: Cache Gradle and wrapper
         uses: actions/cache@v2
@@ -30,4 +31,4 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build

benchmark/build.gradle.kts

@@ -20,11 +20,12 @@ plugins {
 }
 
 android {
+  namespace = "io.getstream.whatsappclone.benchmark"
   compileSdk = Configurations.compileSdk
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   defaultConfig {

build-logic/convention/build.gradle.kts

@@ -5,8 +5,8 @@ plugins {
 group = "io.getstream.whatsappclone.buildlogic"
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

build-logic/convention/src/main/kotlin/io/getstream/whatsappclone/AndroidCompose.kt

@@ -10,7 +10,7 @@ import org.gradle.kotlin.dsl.getByType
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-  commonExtension: CommonExtension<*, *, *, *>,
+  commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
   val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 

build-logic/convention/src/main/kotlin/io/getstream/whatsappclone/KotlinAndroid.kt

@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-  commonExtension: CommonExtension<*, *, *, *>,
+  commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
   commonExtension.apply {
     compileSdk = 33
@@ -23,8 +23,8 @@ internal fun Project.configureKotlinAndroid(
     }
 
     compileOptions {
-      sourceCompatibility = JavaVersion.VERSION_11
-      targetCompatibility = JavaVersion.VERSION_11
+      sourceCompatibility = JavaVersion.VERSION_17
+      targetCompatibility = JavaVersion.VERSION_17
       isCoreLibraryDesugaringEnabled = true
     }
 
@@ -47,7 +47,7 @@ internal fun Project.configureKotlinAndroid(
       )
 
       // Set JVM target to 11
-      jvmTarget = JavaVersion.VERSION_11.toString()
+      jvmTarget = JavaVersion.VERSION_17.toString()
     }
   }
 
@@ -58,6 +58,6 @@ internal fun Project.configureKotlinAndroid(
   }
 }
 
-fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
   (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }

buildSrc/src/main/kotlin/Configurations.kt

@@ -1,6 +1,6 @@
 object Configurations {
-  const val compileSdk = 33
-  const val targetSdk = 33
+  const val compileSdk = 34
+  const val targetSdk = 34
   const val minSdk = 21
   const val majorVersion = 1
   const val minorVersion = 0

core/data/build.gradle.kts

@@ -19,6 +19,10 @@ plugins {
   id("getstream.spotless")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.data"
+}
+
 dependencies {
   api(project(":core:model"))
   api(project(":core:network"))

core/database/build.gradle.kts

@@ -21,6 +21,7 @@ plugins {
 }
 
 android {
+  namespace = "io.getstream.whatsappclone.database"
   defaultConfig {
     // The schemas directory contains a schema file for each version of the Room database.
     // This is required to enable Room auto migrations.

core/designsystem/build.gradle.kts

@@ -19,6 +19,10 @@ plugins {
   id("getstream.spotless")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.designsystem"
+}
+
 dependencies {
   // image loading
   api(libs.landscapist.glide)

core/model/build.gradle.kts

@@ -20,6 +20,10 @@ plugins {
   id("org.jetbrains.kotlin.plugin.serialization")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.model"
+}
+
 dependencies {
   api(libs.stream.client)
   api(libs.retrofit.kotlin.serialization)

core/navigation/build.gradle.kts

@@ -20,6 +20,10 @@ plugins {
   id("getstream.spotless")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.navigation"
+}
+
 dependencies {
   implementation(project(":core:model"))
 

core/network/build.gradle.kts

@@ -20,6 +20,10 @@ plugins {
   id("org.jetbrains.kotlin.plugin.serialization")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.network"
+}
+
 dependencies {
   implementation(project(":core:model"))
 

core/uistate/build.gradle.kts

@@ -20,6 +20,10 @@ plugins {
   id("com.google.devtools.ksp")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.uistate"
+}
+
 kotlin {
   sourceSets.configureEach {
     kotlin.srcDir("$buildDir/generated/ksp/$name/kotlin/")

features/calls/build.gradle.kts

@@ -21,6 +21,10 @@ plugins {
   id("getstream.spotless")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.calls"
+}
+
 dependencies {
   // core modules
   implementation(project(":core:uistate"))

features/camera/build.gradle.kts

@@ -20,6 +20,10 @@ plugins {
   id("getstream.spotless")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.camera"
+}
+
 dependencies {
   implementation(libs.stream.log)
 }

features/chats/build.gradle.kts

@@ -21,6 +21,10 @@ plugins {
   id("getstream.spotless")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.chats"
+}
+
 dependencies {
   // core modules
   implementation(project(":core:uistate"))

features/status/build.gradle.kts

@@ -20,6 +20,10 @@ plugins {
   id("getstream.spotless")
 }
 
+android {
+  namespace = "io.getstream.whatsappclone.status"
+}
+
 dependencies {
   implementation(libs.stream.log)
 }

gradle.properties

@@ -28,3 +28,4 @@ android.useAndroidX=true
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true

gradle/libs.versions.toml

@@ -2,14 +2,14 @@
 streamChatSDK = "5.17.10"
 streamLog = "1.1.4"
 sealedx = "1.0.1"
-landscapist = "2.2.2"
+landscapist = "2.2.10"
 accompanist = "0.30.1"
 androidDesugarJdkLibs = "1.1.5"
-androidGradlePlugin = "7.4.2"
-androidxActivity = "1.7.0"
+androidGradlePlugin = "8.1.2"
+androidxActivity = "1.8.0"
 androidxAppCompat = "1.6.1"
-androidxCompose = "1.3.1"
-androidxComposeCompiler = "1.4.3"
+androidxCompose = "1.5.3"
+androidxComposeCompiler = "1.5.3"
 androidxComposeMaterial3 = "1.0.0-alpha13"
 androidxComposeConstraintLayout = "1.0.1"
 androidxComposeNavigation = "2.5.3"
@@ -28,10 +28,10 @@ androidxUiAutomator = "2.2.0"
 hilt = "2.46"
 hiltExt = "1.0.0"
 junit4 = "4.13.2"
-kotlin = "1.8.10"
+kotlin = "1.9.10"
 kotlinxCoroutines = "1.7.2"
 kotlinxSerializationJson = "1.5.1"
-ksp = "1.8.10-1.0.9"
+ksp = "1.9.10-1.0.13"
 ktlint = "0.43.0"
 okhttp = "4.11.0"
 retrofit = "2.9.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists