From 0cb33fb60184d49cf2e0c082ac57880641472dfa Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Thu, 19 Dec 2024 11:24:09 -0600 Subject: [PATCH] chore: upgrade dependencies (#146) --- demo-app/build.gradle.kts | 8 ++++---- demo-app/demo_app.podspec | 6 +++--- gradle.properties | 1 + gradle/libs.versions.toml | 10 ++++------ iosApp/Podfile.lock | 8 ++++---- lib/maplibre-compose/build.gradle.kts | 2 +- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index e0207ddd..0e71acd5 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -47,13 +47,13 @@ kotlin { iosX64() cocoapods { - summary = "PLACEHOLDER SUMMARY" - homepage = "PLACEHOLDER HOMEPAGE" - ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() + summary = "MapLibre Compose demo app" + homepage = "https://github.com/sargunv/maplibre-compose" + ios.deploymentTarget = "15.3" // TODO reduce this to same as library target? podfile = project.file("../iosApp/Podfile") framework { baseName = "DemoApp" - version = "0.0.0" + version = "0.0.0" // not using real version here because it'll pollute the git diff } pod("MapLibre", libs.versions.maplibre.ios.get()) } diff --git a/demo-app/demo_app.podspec b/demo-app/demo_app.podspec index ccde1b36..57ca0731 100644 --- a/demo-app/demo_app.podspec +++ b/demo-app/demo_app.podspec @@ -1,15 +1,15 @@ Pod::Spec.new do |spec| spec.name = 'demo_app' spec.version = '0.0.0' - spec.homepage = 'PLACEHOLDER HOMEPAGE' + spec.homepage = 'https://github.com/sargunv/maplibre-compose' spec.source = { :http=> ''} spec.authors = '' spec.license = '' - spec.summary = 'PLACEHOLDER SUMMARY' + spec.summary = 'MapLibre Compose demo app' spec.vendored_frameworks = 'build/cocoapods/framework/DemoApp.framework' spec.libraries = 'c++' spec.ios.deployment_target = '15.3' - spec.dependency 'MapLibre', '6.8.1' + spec.dependency 'MapLibre', '6.9.0' if !Dir.exist?('build/cocoapods/framework/DemoApp.framework') || Dir.empty?('build/cocoapods/framework/DemoApp.framework') raise " diff --git a/gradle.properties b/gradle.properties index e7137d00..c20a93e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ androidMinSdk=23 androidCompileSdk=35 androidTargetSdk=35 +iosDeploymentTarget=12.0 kotlin.code.style=official kotlin.daemon.jvmargs=-Xmx2048M org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 36fd3eeb..73dcf7eb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,12 @@ [versions] -ios-deploymentTarget = "15.3" - androidx-activity = "1.9.3" -androidx-composeUi = "1.7.5" -androidx-navigation = "2.8.0-alpha10" +androidx-composeUi = "1.7.6" +androidx-navigation = "2.8.0-alpha11" kermit = "2.0.5" ktor = "3.0.2" -maplibre-android-sdk = "11.7.0" +maplibre-android-sdk = "11.7.1" maplibre-android-plugins = "3.0.2" -maplibre-ios = "6.8.1" +maplibre-ios = "6.9.0" spatialk = "0.3.0" gradle-android = "8.7.3" diff --git a/iosApp/Podfile.lock b/iosApp/Podfile.lock index dd2d331c..be264976 100644 --- a/iosApp/Podfile.lock +++ b/iosApp/Podfile.lock @@ -1,7 +1,7 @@ PODS: - demo_app (0.0.0): - - MapLibre (= 6.8.1) - - MapLibre (6.8.1) + - MapLibre (= 6.9.0) + - MapLibre (6.9.0) DEPENDENCIES: - demo_app (from `../demo-app`) @@ -15,8 +15,8 @@ EXTERNAL SOURCES: :path: "../demo-app" SPEC CHECKSUMS: - demo_app: a5a32dc01c2392d3d763615568685a2318d40f44 - MapLibre: 46c5f2254df2ea03bcd097778bb19c92207d8c2a + demo_app: b238b8d5f61c098c1a1f240226fc1a1f462fc843 + MapLibre: 9a09c08b1fe85223ead59ebfb494b79deefc296a PODFILE CHECKSUM: faffe0b5720ea7a96818a908bd93100321d4e51f diff --git a/lib/maplibre-compose/build.gradle.kts b/lib/maplibre-compose/build.gradle.kts index c4e2027c..e3604131 100644 --- a/lib/maplibre-compose/build.gradle.kts +++ b/lib/maplibre-compose/build.gradle.kts @@ -37,7 +37,7 @@ kotlin { cocoapods { noPodspec() - ios.deploymentTarget = "12.0" + ios.deploymentTarget = project.properties["iosDeploymentTarget"]!!.toString() pod("MapLibre", libs.versions.maplibre.ios.get()) }