Merge pull request #21 from JetBrains/igor.demin/update-android
Update Android project
This commit is contained in:
commit
0840a6c9bd
@ -14,11 +14,11 @@ org.jetbrains.compose.experimental.uikit.enabled=true
|
||||
|
||||
#Android
|
||||
android.useAndroidX=true
|
||||
android.compileSdk=33
|
||||
android.targetSdk=33
|
||||
android.targetSdk=34
|
||||
android.compileSdk=34
|
||||
android.minSdk=24
|
||||
|
||||
#Versions
|
||||
kotlin.version=1.9.0
|
||||
agp.version=7.4.2
|
||||
agp.version=8.0.2
|
||||
compose.version=1.5.0-rc01
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
@ -30,9 +30,9 @@ kotlin {
|
||||
}
|
||||
val androidMain by getting {
|
||||
dependencies {
|
||||
api("androidx.activity:activity-compose:1.6.1")
|
||||
api("androidx.activity:activity-compose:1.7.2")
|
||||
api("androidx.appcompat:appcompat:1.6.1")
|
||||
api("androidx.core:core-ktx:1.9.0")
|
||||
api("androidx.core:core-ktx:1.10.1")
|
||||
}
|
||||
}
|
||||
val iosX64Main by getting
|
||||
@ -57,7 +57,6 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
minSdk = (findProperty("android.minSdk") as String).toInt()
|
||||
targetSdk = (findProperty("android.targetSdk") as String).toInt()
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
|
Reference in New Issue
Block a user