Skip to content

Commit

Permalink
chore: upgrade dependencies (#146)
Browse files Browse the repository at this point in the history
  • Loading branch information
sargunv authored Dec 19, 2024
1 parent 586baf7 commit 0cb33fb
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 18 deletions.
8 changes: 4 additions & 4 deletions demo-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down
6 changes: 3 additions & 3 deletions demo-app/demo_app.podspec
Original file line number Diff line number Diff line change
@@ -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 "
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 4 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
8 changes: 4 additions & 4 deletions iosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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`)
Expand All @@ -15,8 +15,8 @@ EXTERNAL SOURCES:
:path: "../demo-app"

SPEC CHECKSUMS:
demo_app: a5a32dc01c2392d3d763615568685a2318d40f44
MapLibre: 46c5f2254df2ea03bcd097778bb19c92207d8c2a
demo_app: b238b8d5f61c098c1a1f240226fc1a1f462fc843
MapLibre: 9a09c08b1fe85223ead59ebfb494b79deefc296a

PODFILE CHECKSUM: faffe0b5720ea7a96818a908bd93100321d4e51f

Expand Down
2 changes: 1 addition & 1 deletion lib/maplibre-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ kotlin {

cocoapods {
noPodspec()
ios.deploymentTarget = "12.0"
ios.deploymentTarget = project.properties["iosDeploymentTarget"]!!.toString()
pod("MapLibre", libs.versions.maplibre.ios.get())
}

Expand Down

0 comments on commit 0cb33fb

Please sign in to comment.