tianzixuan/compose-multiplatform-ios-android-template
Archived
Template
1
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge pull request #21 from JetBrains/igor.demin/update-android

Browse Source 
Update Android project
This commit is contained in:
Igor Demin 2023-08-25 16:47:43 +02:00 committed by GitHub
commit 0840a6c9bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@ -14,11 +14,11 @@ org.jetbrains.compose.experimental.uikit.enabled=true
#Android #Android
android.useAndroidX=true android.useAndroidX=true
android.compileSdk=33 android.targetSdk=34
android.targetSdk=33 android.compileSdk=34
android.minSdk=24 android.minSdk=24
#Versions #Versions
kotlin.version=1.9.0 kotlin.version=1.9.0
agp.version=7.4.2 agp.version=8.0.2
compose.version=1.5.0-rc01 compose.version=1.5.0-rc01

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

5
shared/build.gradle.kts
View File

@ -30,9 +30,9 @@ kotlin {
} }
val androidMain by getting { val androidMain by getting {
dependencies { 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.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 val iosX64Main by getting
@ -57,7 +57,6 @@ android {
defaultConfig { defaultConfig {
minSdk = (findProperty("android.minSdk") as String).toInt() minSdk = (findProperty("android.minSdk") as String).toInt()
targetSdk = (findProperty("android.targetSdk") as String).toInt()
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11