Skip to content

Update the migrated project to Jetpack Compose, StateFlow, Material3 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 23, 2025
Merged

Update the migrated project to Jetpack Compose, StateFlow, Material3 #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ccc764a
Update project configurations to support JDK 11 and SDK 35
pahill Mar 4, 2025
afac9cd
Set minSdk version to 24 in build configuration
pahill Mar 4, 2025
e5f67dc
Merge pull request #36 from Kotlin/master_meerkat
pahill Mar 13, 2025
72e6df9
Convert to Jetpack Compose and StateFlow.
pahill Apr 17, 2025
66b0d07
Update Gradle settings, dependencies, and cleanup unused code
pahill Apr 19, 2025
3b59306
Add `Greeting` class and configure dependencies
pahill Apr 19, 2025
483a075
Code review changes
pahill Apr 23, 2025
8466f03
Merging
pahill Apr 23, 2025
34b0457
Merging
pahill Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update project configurations to support JDK 11 and SDK 35 
Upgraded JVM target to 11, compileSdk and targetSdk to 35, and Kotlin to 2.1.10 for improved compatibility and performance. Updated Gradle wrapper, dependencies, and plugin versions to align with these changes. Minor IDE configuration adjustments were also made to reflect the new settings.
  • Loading branch information
@pahill
pahill committed Mar 4, 2025
commit ccc764a4aa42c2715c48aa806504149a695e60f6
2 changes: 2 additions & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11

plugins {
alias(libs.plugins.androidApplication)
Expand All @@ -7,17 +7,17 @@ plugins {

kotlin {
compilerOptions {
jvmTarget = JVM_1_8
jvmTarget = JVM_11
}
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.jetbrains.simplelogin.androidapp"
minSdk = 21
targetSdk = 34
targetSdk = 35
versionCode = 1
versionName = "1.0"

Expand All @@ -34,8 +34,8 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
buildFeatures {
viewBinding = true
Expand Down
24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[versions]
android-gradlePlugin = "8.2.2"
android-compileSdk = "34"
android-gradlePlugin = "8.8.2"
android-compileSdk = "35"
android-minSdk = "24"
android-targetSdk = "34"
androidx-activityCompose = "1.9.0"
android-targetSdk = "35"
androidx-activityCompose = "1.10.1"
androidx-appcompat = "1.7.0"
androidx-constraintlayout = "2.1.4"
androidx-core-ktx = "1.13.1"
androidx-constraintlayout = "2.2.1"
androidx-core-ktx = "1.15.0"
androidx-espresso-core = "3.6.1"
androidx-material = "1.12.0"
androidx-test-junit = "1.2.1"
annotation = "1.8.0"
compose = "1.6.8"
annotation = "1.9.1"
compose = "1.7.8"
compose-plugin = "1.6.10"
imageLoader = "1.6.3"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinxCoroutinesCore = "1.8.0"
ktor = "2.3.7"
lifecycleLivedataKtx = "2.8.2"
kotlin = "2.1.10"
ktor = "3.1.0"
kotlinxCoroutinesCore = "1.10.1"
lifecycleLivedataKtx = "2.8.7"
voyagerNavigator = "1.0.0"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down