Merge pull request #167 from geoadmin/release/2.6.2

Release 2.6.2
geoadmin · Oct 17, 2024 · 242958a · 242958a
2 parents b43d84c + a72bb32
commit 242958a
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 24 deletions.
diff --git 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 SwisstopoMapSDK -destination 'platform=iOS Simulator,OS=18.0,name=iPhone 16 Pro'
diff --git 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
@@ -6,35 +6,35 @@
         "repositoryURL": "https://github.com/UbiqueInnovation/djinni.git",
         "state": {
           "branch": null,
-          "revision": "01dd31c42ef00a63c839b6fd20cd4895903e0215",
-          "version": "1.0.7"
+          "revision": "f5591eee5bba0aa4aabf1d26de1baa1f61821edb",
+          "version": "1.0.8"
         }
       },
       {
         "package": "LayerGps",
         "repositoryURL": "https://github.com/openmobilemaps/layer-gps.git",
         "state": {
           "branch": null,
-          "revision": "05bff4bbb103bd1762e3dd4f72b979e151eea2d9",
-          "version": "2.6.1"
+          "revision": "2330be4efb128d0cf2e72ef9f3c16c2d2ae79703",
+          "version": "2.6.2"
         }
       },
       {
         "package": "MapCore",
         "repositoryURL": "https://github.com/openmobilemaps/maps-core.git",
         "state": {
           "branch": null,
-          "revision": "929effeff6c122c0e7fa58bf5be5f6b31f5610bf",
-          "version": "2.6.1"
+          "revision": "32258f1c173fe9f60d80863e51a0400967e40149",
+          "version": "2.6.2"
         }
       },
       {
         "package": "UBKit",
         "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"))
 ]
 ```