Skip to content

Commit

Permalink
Move to Kotlin 2.0.0-Beta4 and update other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
findjigar committed Mar 19, 2024
1 parent 5a1c00b commit 3f0fb38
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 41 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ Pods/
.idea/inspectionProfiles/Project_Default.xml
.idea/dictionaries/matyas.xml
/.idea/
.kotlin
41 changes: 20 additions & 21 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@ targetSdk = "34"
compileSdk = "34"

# Dependencies
kotlin = "1.9.22"
android-gradle-plugin = "8.2.1"
coroutines = "1.7.3"
kotlinx-datetime = "0.5.0"
ktor = "2.3.7"
kotlin = "2.0.0-Beta4"
android-gradle-plugin = "8.2.2"
coroutines = "1.8.0"
kotlinx-datetime = "0.6.0-RC.2"
ktor = "2.3.9"

stately = "2.0.5"
stately = "2.0.6"
java = "17"
kermit = "2.0.2"
kermit = "2.0.3"
sqliter = "1.3.1"

hyperdrive = "0.1.148"

multiplatformSettings = "1.1.1"
sqlDelight = "2.0.1"
firebase-bom = "32.4.1"
firebase-bom = "32.7.4"
firebase-crashlytics-gradle = "2.9.9"
gms-google-services = "4.4.0"
gms-google-services = "4.4.1"

compose-main = "1.5.4"
compose-compiler = "1.5.8-dev-k1.9.22-42b6ec2b037"
composeNavigation = "2.7.6"
compose-jb = "1.6.0-dev1357"
compose-androidx-ui = "1.6.3"
compose-compiler = "1.5.11-dev-k2.0.0-Beta4-21f5e479a96"
composeNavigation = "2.7.7"
compose-jb = "1.6.1"

accompanistCoil = "0.15.0"
accompanistNavigationAnimation = "0.32.0"
accompanistNavigationAnimation = "0.34.0"
splashscreen = "1.0.1"
junit = "4.13.2"
junitKtx = "1.1.5"
Expand All @@ -39,11 +39,11 @@ korio = "4.0.10"

# Sample - Android
androidx-core = "1.12.0"
androidx-lifecycle = "2.6.2"
androidx-lifecycle = "2.7.0"
androidx-activity-compose = "1.8.2"
android-desugaring = "2.0.4"
koin = "3.5.3"
uuid = "0.8.2"
uuid = "0.8.3"
ktlint = "11.0.0"

[libraries]
Expand All @@ -60,7 +60,6 @@ hyperdrive-multiplatformx-api = { module = "org.brightify.hyperdrive:multiplatfo
android-desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "android-desugaring" }
uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
korio = { module = "com.soywiz.korlibs.korio:korio", version.ref = "korio" }
kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
test-junit = { module = "junit:junit", version.ref = "junit" }
test-junitKtx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
test-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
Expand Down Expand Up @@ -97,10 +96,10 @@ androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-kt
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }

compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-main" }
compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-main" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-main" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose-main" }
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-androidx-ui" }
compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-androidx-ui" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-androidx-ui" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose-androidx-ui" }
compose-activity = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "composeNavigation" }

Expand Down
4 changes: 2 additions & 2 deletions ios/Droidcon/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
DroidconKit: cd22217cc0ae47a3f34cb259042e67977cc38172
DroidconKit: 3bfe02779d121f3bd294309010e9ff416ed968a4
Firebase: 6c1bf3f534bc422d52af2e41fe0d50bf08b6b773
FirebaseAnalytics: 5c6d58814afa4db82cf7fdbc02b0b0e2fa3d43ff
FirebaseCore: 6fc17ac9f03509d51c131298aacb3ee5698b4f02
Expand All @@ -158,4 +158,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 985d3b9cbc157b9c35aee865f42c33cf368f621a

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
4 changes: 4 additions & 0 deletions ios/DroidconKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
end

spec.xcconfig = {
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
}

spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':ios',
'PRODUCT_MODULE_NAME' => 'DroidconKit',
Expand Down
37 changes: 19 additions & 18 deletions ios/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ version = "1.0"

kotlin {
iosX64()
iosArm64()
iosSimulatorArm64()
iosArm64()
iosSimulatorArm64()

applyDefaultHierarchyTemplate()

sourceSets {
all {
Expand All @@ -23,25 +25,24 @@ kotlin {
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
}
}
iosMain {
dependencies {
implementation(compose.ui)
implementation(compose.foundation)
implementation(compose.material)
implementation(compose.runtime)
iosMain.dependencies {
implementation(compose.ui)
implementation(compose.foundation)
implementation(compose.material)
implementation(compose.runtime)

api(project(":shared"))
api(project(":shared-ui"))
api(libs.kermit)
api(libs.kermit.simple)
}
api(project(":shared"))
api(project(":shared-ui"))
api(libs.kermit)
api(libs.kermit.simple)
api(libs.hyperdrive.multiplatformx.api)
}
}

sourceSets.matching { it.name.endsWith("Test") }
.configureEach {
languageSettings.optIn("kotlin.time.ExperimentalTime")
}
matching { it.name.endsWith("Test") }
.configureEach {
languageSettings.optIn("kotlin.time.ExperimentalTime")
}
}

cocoapods {
summary = "Common library for the Droidcon app"
Expand Down

0 comments on commit 3f0fb38

Please sign in to comment.