From aefbd703bd048a75a4fd96bfff138e5e5519cf35 Mon Sep 17 00:00:00 2001 From: Stefan Mitterrutzner Date: Thu, 17 Oct 2024 15:45:15 +0200 Subject: [PATCH] update packages to 2.6.2 --- .github/workflows/ios.yml | 17 +++++++++-------- CHANGELOG.md | 4 ++++ Package.resolved | 16 ++++++++-------- Package.swift | 4 ++-- android/README.md | 2 +- android/build.gradle | 4 ++-- android/gradle.properties | 4 ++-- ios/README.md | 2 +- 8 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index df3808d..ae73bc9 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -1,19 +1,20 @@ name: ios +env: + XCODE_VERSION: 'Xcode_16.0' + on: pull_request: - branches: [ main, develop ] + branches: [ main, develop, release/** ] jobs: build: - - runs-on: macos-12 - + runs-on: macos-15 steps: - uses: actions/checkout@v2 with: - submodules: recursive - - name: Switch to Xcode 14.2.0 - run: sudo xcode-select --switch /Applications/Xcode_14.2.0.app + submodules: 'recursive' + - name: Switch to Xcode ${{ env.XCODE_VERSION }} + run: sudo xcode-select --switch /Applications/${{ env.XCODE_VERSION }}.app - name: Build - run: swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios13.0-simulator" + run: xcodebuild -scheme LayerGps -destination 'platform=iOS Simulator,OS=18.0,name=iPhone 16 Pro' diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bebbb4..95cda38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Open Swiss Maps SDK +## Version 2.6.2 +- Update [mapscore to 2.6.2](https://github.com/openmobilemaps/maps-core/releases/tag/2.6.2) +- Update [gps-layer to 2.6.2](https://github.com/openmobilemaps/layer-gps/releases/tag/2.6.2) + ## Version 2.6.1 - Update [mapscore to 2.6.1](https://github.com/openmobilemaps/maps-core/releases/tag/2.6.1) - Update [gps-layer to 2.6.1](https://github.com/openmobilemaps/layer-gps/releases/tag/2.6.1) diff --git a/Package.resolved b/Package.resolved index 65c51a1..1023906 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/UbiqueInnovation/djinni.git", "state": { "branch": null, - "revision": "01dd31c42ef00a63c839b6fd20cd4895903e0215", - "version": "1.0.7" + "revision": "f5591eee5bba0aa4aabf1d26de1baa1f61821edb", + "version": "1.0.8" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/openmobilemaps/layer-gps.git", "state": { "branch": null, - "revision": "05bff4bbb103bd1762e3dd4f72b979e151eea2d9", - "version": "2.6.1" + "revision": "2330be4efb128d0cf2e72ef9f3c16c2d2ae79703", + "version": "2.6.2" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/openmobilemaps/maps-core.git", "state": { "branch": null, - "revision": "929effeff6c122c0e7fa58bf5be5f6b31f5610bf", - "version": "2.6.1" + "revision": "32258f1c173fe9f60d80863e51a0400967e40149", + "version": "2.6.2" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/UbiqueInnovation/ubkit-ios", "state": { "branch": null, - "revision": "f88275599ee706ca795bf72177c803470438cc28", - "version": "1.9.4" + "revision": "0afb74223a3c6abcedd7d2542fdef0549104726a", + "version": "1.12.5" } } ] diff --git a/Package.swift b/Package.swift index d664f52..e012cc8 100644 --- a/Package.swift +++ b/Package.swift @@ -22,8 +22,8 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/openmobilemaps/maps-core.git", from: "2.6.1"), - .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: "2.6.1") + .package(url: "https://github.com/openmobilemaps/maps-core.git", from: "2.6.2"), + .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: "2.6.2") ], targets: [ .target( diff --git a/android/README.md b/android/README.md index 52faafd..e44dd5e 100644 --- a/android/README.md +++ b/android/README.md @@ -41,7 +41,7 @@ To add the OpenSwissMaps SDK to your Android project, add the following line to your build.gradle ``` dependencies { - implementation 'ch.admin.geo.openswissmaps:openswissmaps-sdk:2.6.1' + implementation 'ch.admin.geo.openswissmaps:openswissmaps-sdk:2.6.2' } ``` Make sure you have mavenCentral() listed in your project repositories. diff --git a/android/build.gradle b/android/build.gradle index 528b396..249a9b1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -189,8 +189,8 @@ dependencies { implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" - api "io.openmobilemaps:mapscore:2.6.1" - api "io.openmobilemaps:layer-gps:2.6.1" + api "io.openmobilemaps:mapscore:2.6.2" + api "io.openmobilemaps:layer-gps:2.6.2" implementation "ch.ubique.android:djinni-support-lib:1.0.7" testImplementation 'junit:junit:4.13.2' diff --git a/android/gradle.properties b/android/gradle.properties index 4e45a9a..b453fbf 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -29,8 +29,8 @@ android.enableR8.fullMode=false GROUP=ch.admin.geo.openswissmaps POM_ARTIFACT_ID=openswissmaps-sdk -VERSION_NAME=2.6.1 -VERSION_CODE=2060100 +VERSION_NAME=2.6.2 +VERSION_CODE=2060200 PUBLISH_VARIANT=release diff --git a/ios/README.md b/ios/README.md index c17436c..a4b93b3 100644 --- a/ios/README.md +++ b/ios/README.md @@ -48,7 +48,7 @@ Once you have your Swift package set up, adding Open Mobile Maps as a dependency ```swift dependencies: [ - .package(url: "https://github.com/geoadmin/lib-open-swiss-maps-sdk.git", .upToNextMajor(from: "2.6.1")) + .package(url: "https://github.com/geoadmin/lib-open-swiss-maps-sdk.git", .upToNextMajor(from: "2.6.2")) ] ```