Skip to content

Commit 8786ab6

Browse files
committed
Bump Compose UI/compiler, Kotlin, and several dependencies
1 parent 4549ecb commit 8786ab6

File tree

19 files changed

+63
-20
lines changed

19 files changed

+63
-20
lines changed

benchmark/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ plugins {
2020
}
2121

2222
android {
23+
namespace = "io.getstream.whatsappclone.benchmark"
2324
compileSdk = Configurations.compileSdk
2425

2526
compileOptions {
26-
sourceCompatibility = JavaVersion.VERSION_11
27-
targetCompatibility = JavaVersion.VERSION_11
27+
sourceCompatibility = JavaVersion.VERSION_17
28+
targetCompatibility = JavaVersion.VERSION_17
2829
}
2930

3031
defaultConfig {

build-logic/convention/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins {
55
group = "io.getstream.whatsappclone.buildlogic"
66

77
java {
8-
sourceCompatibility = JavaVersion.VERSION_11
9-
targetCompatibility = JavaVersion.VERSION_11
8+
sourceCompatibility = JavaVersion.VERSION_17
9+
targetCompatibility = JavaVersion.VERSION_17
1010
}
1111

1212
dependencies {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.gradle.kotlin.dsl.getByType
1010
* Configure Compose-specific options
1111
*/
1212
internal fun Project.configureAndroidCompose(
13-
commonExtension: CommonExtension<*, *, *, *>,
13+
commonExtension: CommonExtension<*, *, *, *, *>,
1414
) {
1515
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
1616

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
1313
* Configure base Kotlin with Android options
1414
*/
1515
internal fun Project.configureKotlinAndroid(
16-
commonExtension: CommonExtension<*, *, *, *>,
16+
commonExtension: CommonExtension<*, *, *, *, *>,
1717
) {
1818
commonExtension.apply {
1919
compileSdk = 33
@@ -23,8 +23,8 @@ internal fun Project.configureKotlinAndroid(
2323
}
2424

2525
compileOptions {
26-
sourceCompatibility = JavaVersion.VERSION_11
27-
targetCompatibility = JavaVersion.VERSION_11
26+
sourceCompatibility = JavaVersion.VERSION_17
27+
targetCompatibility = JavaVersion.VERSION_17
2828
isCoreLibraryDesugaringEnabled = true
2929
}
3030

@@ -47,7 +47,7 @@ internal fun Project.configureKotlinAndroid(
4747
)
4848

4949
// Set JVM target to 11
50-
jvmTarget = JavaVersion.VERSION_11.toString()
50+
jvmTarget = JavaVersion.VERSION_17.toString()
5151
}
5252
}
5353

@@ -58,6 +58,6 @@ internal fun Project.configureKotlinAndroid(
5858
}
5959
}
6060

61-
fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
61+
fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
6262
(this as ExtensionAware).extensions.configure("kotlinOptions", block)
6363
}

buildSrc/src/main/kotlin/Configurations.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Configurations {
2-
const val compileSdk = 33
3-
const val targetSdk = 33
2+
const val compileSdk = 34
3+
const val targetSdk = 34
44
const val minSdk = 21
55
const val majorVersion = 1
66
const val minorVersion = 0

core/data/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ plugins {
1919
id("getstream.spotless")
2020
}
2121

22+
android {
23+
namespace = "io.getstream.whatsappclone.data"
24+
}
25+
2226
dependencies {
2327
api(project(":core:model"))
2428
api(project(":core:network"))

core/database/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ plugins {
2121
}
2222

2323
android {
24+
namespace = "io.getstream.whatsappclone.database"
2425
defaultConfig {
2526
// The schemas directory contains a schema file for each version of the Room database.
2627
// This is required to enable Room auto migrations.

core/designsystem/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ plugins {
1919
id("getstream.spotless")
2020
}
2121

22+
android {
23+
namespace = "io.getstream.whatsappclone.designsystem"
24+
}
25+
2226
dependencies {
2327
// image loading
2428
api(libs.landscapist.glide)

core/model/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ plugins {
2020
id("org.jetbrains.kotlin.plugin.serialization")
2121
}
2222

23+
android {
24+
namespace = "io.getstream.whatsappclone.model"
25+
}
26+
2327
dependencies {
2428
api(libs.stream.client)
2529
api(libs.retrofit.kotlin.serialization)

core/navigation/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ plugins {
2020
id("getstream.spotless")
2121
}
2222

23+
android {
24+
namespace = "io.getstream.whatsappclone.navigation"
25+
}
26+
2327
dependencies {
2428
implementation(project(":core:model"))
2529

0 commit comments

Comments
 (0)