Skip to content

Commit

Permalink
Merge pull request #260 from joreilly/dependency_updates
Browse files Browse the repository at this point in the history
dependency updates
  • Loading branch information
joreilly authored Dec 20, 2024
2 parents 9467dc4 + b7946e8 commit 95fffe2
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
java-version: 17

- name: Build iOS app
run: xcodebuild -allowProvisioningUpdates -workspace ios/BikeShare/BikeShare.xcodeproj/project.xcworkspace -configuration Debug -scheme BikeShare -sdk iphoneos -destination name='iPhone 14' build
run: xcodebuild -allowProvisioningUpdates -workspace ios/BikeShare/BikeShare.xcodeproj/project.xcworkspace -configuration Debug -scheme BikeShare -sdk iphoneos -destination name='iPhone 15 Pro' build



2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
org.gradle.jvmargs=-Xmx4096m
android.useAndroidX=true
android.enableJetifier=false

kotlin.code.style=official
kotlin.native.toolchain.enabled=false

kotlin.mpp.stability.nowarn=true

Expand Down
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[versions]
kotlin = "2.0.21"
ksp = "2.0.21-1.0.26"
kotlin = "2.1.0"
ksp = "2.1.0-1.0.28"

coroutines = "1.9.0"
kotlinxSerialization = "1.7.3"


androidGradlePlugin = "8.7.2"
androidGradlePlugin = "8.7.3"
circuit = "0.24.0"
kotlininject = "0.7.2"
ktor = "3.0.0"
ktor = "3.0.1"
slf4j = "2.0.16"
kmpNativeCoroutines = "1.0.0-ALPHA-37"
kmpNativeCoroutines = "1.0.0-ALPHA-37-kotlin-2.1.0-RC2"
kmpObservableViewModel = "1.0.0-BETA-7"

compose-multiplatform = "1.7.0"
compose-multiplatform = "1.7.3"
composeAdaptiveLayout = "1.0.0"
androidxActivity = "1.9.3"
androidxRoom = "2.7.0-alpha11"
sqlite = "2.5.0-alpha11"
androidxComposeBom = "2024.10.01"
androidxNavigationCompose = "2.8.3"
androidxRoom = "2.7.0-alpha12"
sqlite = "2.5.0-alpha12"
androidxComposeBom = "2024.12.01"
androidxNavigationCompose = "2.8.5"
androidxLifecycle = "2.8.7"
junit = "4.13.2"

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 95fffe2

Please sign in to comment.