diff --git a/gradle.properties b/gradle.properties index 2fa452f..67b7ebd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ android.minSdk=24 #Versions kotlin.version=1.8.20 -agp.version=7.4.2 +agp.version=8.0.0 compose.version=1.4.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..93fa2ef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri May 12 22:04:12 CEST 2023 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.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/readme_images/android_app_running.png b/readme_images/android_app_running.png index 7063fa2..335c523 100644 Binary files a/readme_images/android_app_running.png and b/readme_images/android_app_running.png differ diff --git a/readme_images/banner.png b/readme_images/banner.png index e933639..d4164ab 100644 Binary files a/readme_images/banner.png and b/readme_images/banner.png differ diff --git a/readme_images/hello_world_ios.png b/readme_images/hello_world_ios.png index ae55827..4bf729d 100644 Binary files a/readme_images/hello_world_ios.png and b/readme_images/hello_world_ios.png differ diff --git a/readme_images/text_field_added.png b/readme_images/text_field_added.png index 07e8163..a6f1c6f 100644 Binary files a/readme_images/text_field_added.png and b/readme_images/text_field_added.png differ diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 74e36a8..fab67ba 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -30,16 +30,16 @@ kotlin { dependencies { implementation(compose.runtime) implementation(compose.foundation) - implementation(compose.material) + implementation(compose.material3) @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) implementation(compose.components.resources) } } val androidMain by getting { dependencies { - api("androidx.activity:activity-compose:1.6.1") + api("androidx.activity:activity-compose:1.7.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 @@ -64,7 +64,6 @@ android { defaultConfig { minSdk = (findProperty("android.minSdk") as String).toInt() - targetSdk = (findProperty("android.targetSdk") as String).toInt() } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/shared/src/commonMain/kotlin/App.kt b/shared/src/commonMain/kotlin/App.kt index 0889bdd..ce56413 100644 --- a/shared/src/commonMain/kotlin/App.kt +++ b/shared/src/commonMain/kotlin/App.kt @@ -2,9 +2,9 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material.Button -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf