update kotlin, gradle, java version

This commit is contained in:
hientx 2023-07-27 21:04:15 +02:00
parent b49a093557
commit 8b96cfe37f
8 changed files with 24 additions and 18 deletions

View file

@ -45,12 +45,13 @@ android {
buildFeatures {
compose = true
buildConfig = true
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
composeOptions {
@ -59,7 +60,11 @@ android {
kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
jvmTarget = "1.8"
jvmTarget = "17"
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
}

View file

@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build", "gradle", "7.4.2")
classpath("com.android.tools.build", "gradle", "8.1.0")
classpath(kotlin("gradle-plugin", libs.versions.kotlin.get()))
}
}

View file

@ -28,8 +28,8 @@ android {
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
composeOptions {
@ -37,7 +37,7 @@ android {
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}

View file

@ -28,8 +28,8 @@ android {
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
composeOptions {
@ -38,7 +38,7 @@ android {
kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
jvmTarget = "1.8"
jvmTarget = "17"
}
}

View file

@ -28,8 +28,8 @@ android {
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
composeOptions {
@ -38,7 +38,7 @@ android {
kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
jvmTarget = "1.8"
jvmTarget = "17"
}
}

View file

@ -3,3 +3,4 @@ android.useAndroidX=true
android.enableJetifier=false
kotlin.code.style=official
android.enableR8.fullMode=true
android.defaults.buildfeatures.buildconfig=true

View file

@ -1,6 +1,6 @@
#Wed Jul 19 22:06:45 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View file

@ -11,12 +11,12 @@ dependencyResolutionManagement {
versionCatalogs {
create("libs") {
version("kotlin", "1.7.20")
version("kotlin", "1.8.21")
plugin("kotlin-serialization","org.jetbrains.kotlin.plugin.serialization").versionRef("kotlin")
library("kotlin-coroutines","org.jetbrains.kotlinx", "kotlinx-coroutines-core").version("1.6.4")
version("compose-compiler", "1.3.2")
version("compose-compiler", "1.4.7")
version("compose", "1.3.0-rc01")
library("compose-foundation", "androidx.compose.foundation", "foundation").versionRef("compose")
@ -25,10 +25,10 @@ dependencyResolutionManagement {
library("compose-ripple", "androidx.compose.material", "material-ripple").versionRef("compose")
library("compose-shimmer", "com.valentinilk.shimmer", "compose-shimmer").version("1.0.3")
library("compose-activity", "androidx.activity", "activity-compose").version("1.7.0-alpha01")
library("compose-coil", "io.coil-kt", "coil-compose").version("2.2.2")
library("compose-preview", "androidx.compose.ui:ui-tooling-preview", "preview").version("2.2.2")
version("room", "2.5.0-beta01")
library("room", "androidx.room", "room-ktx").versionRef("room")