diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 55f99feb..47a4f445 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -1,7 +1,7 @@ import java.util.Properties plugins { - id("org.jetbrains.compose") version "1.0.0-alpha4-build321" + id("org.jetbrains.compose") version "1.0.0-alpha4-build328" id("com.android.application") kotlin("android") kotlin("kapt") @@ -20,11 +20,11 @@ dependencies { } android { - compileSdk = 30 + compileSdk = 31 defaultConfig { applicationId = "dev.msfjarvis.claw.android" minSdk = 23 - targetSdk = 30 + targetSdk = 31 versionCode = 1 versionName = "1.0" } @@ -50,7 +50,7 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } } diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 7e4e805f..f6ddd4d2 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ android:name=".ClawApplication" android:theme="@style/Theme.AppCompat.Light.NoActionBar" > - + diff --git a/api/build.gradle.kts b/api/build.gradle.kts index d6789ad2..62323d15 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("jvm") - id("com.google.devtools.ksp") version "1.5.21-1.0.0-beta07" + id("com.google.devtools.ksp") version "1.5.30-1.0.0-beta08" } dependencies { diff --git a/build.gradle.kts b/build.gradle.kts index 0d956b16..9594ede9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { } dependencies { classpath("com.android.tools:r8:3.1.17-dev") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30") classpath("com.android.tools.build:gradle:7.1.0-alpha10") classpath("com.diffplug.spotless:spotless-plugin-gradle:5.14.3") classpath("com.google.dagger:hilt-android-gradle-plugin:2.38.1") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index ce16ffa3..416fda12 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("multiplatform") - id("org.jetbrains.compose") version "1.0.0-alpha4-build321" + id("org.jetbrains.compose") version "1.0.0-alpha4-build328" id("com.android.library") } @@ -50,13 +50,13 @@ tasks.withType { android { buildFeatures { androidResources = true } - compileSdk = 30 + compileSdk = 31 sourceSets["main"].apply { manifest.srcFile("src/androidMain/AndroidManifest.xml") res.srcDirs("src/commonMain/resources") } defaultConfig { minSdk = 23 - targetSdk = 30 + targetSdk = 31 } } diff --git a/database/build.gradle.kts b/database/build.gradle.kts index 77bfe90b..06ca9c99 100644 --- a/database/build.gradle.kts +++ b/database/build.gradle.kts @@ -40,11 +40,11 @@ kotlin { } android { - compileSdk = 30 + compileSdk = 31 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { minSdk = 23 - targetSdk = 30 + targetSdk = 31 consumerProguardFiles("consumer-rules.pro") } } diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 33a38f57..b67e5be3 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { kotlin("multiplatform") - id("org.jetbrains.compose") version "1.0.0-alpha4-build321" + id("org.jetbrains.compose") version "1.0.0-alpha4-build328" } group = "dev.msfjarvis.claw" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d2039dc0..29bb6e0e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] coroutines = "1.5.1" hilt = "2.38.1" -moshix = "0.12.2" +moshix = "0.13.0" retrofit = "2.9.0" sqldelight = "1.5.1"