Merge pull request #162 from geoadmin/release/2.4.0

Release 2.4.0
geoadmin · Aug 15, 2024 · c1e6d51 · c1e6d51
2 parents fa58c53 + 4778b3b
commit c1e6d51
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Open Swiss Maps SDK
 
+## Version 2.4.0
+- update [mapscore to 2.4.0](https://github.com/openmobilemaps/maps-core/releases/tag/2.4.0)
+- update [gps-layer to 2.4.0](https://github.com/openmobilemaps/layer-gps/releases/tag/2.4.0)
+- Update AGP and Kotlin versions for Android
+- Fix of iOS include path
+
 ## Version 2.3.0
 - update [mapscore to 2.3.0](https://github.com/openmobilemaps/maps-core/releases/tag/2.3.0)
 - update [gps-layer to 2.3.0](https://github.com/openmobilemaps/layer-gps/releases/tag/2.3.0)

diff --git a/Package.resolved b/Package.resolved
@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/openmobilemaps/layer-gps.git",
         "state": {
           "branch": null,
-          "revision": "18c9ed44f82b29a5537c5c42e879f313c3359453",
-          "version": "2.3.0"
+          "revision": "f5da293538b8875cdd2d3cb0de3fa4021e53a0d3",
+          "version": "2.4.0"
         }
       },
       {
         "package": "MapCore",
         "repositoryURL": "https://github.com/openmobilemaps/maps-core.git",
         "state": {
           "branch": null,
-          "revision": "9af34563358f90ced1f3d531375af1d7775bf0dd",
-          "version": "2.3.0"
+          "revision": "b2e8a8d3aaacc53b2ebcaaaa84afe4d0dfde5de2",
+          "version": "2.4.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -23,8 +23,8 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/openmobilemaps/maps-core.git", from: "2.3.0"),
-        .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: "2.3.0")
+        .package(url: "https://github.com/openmobilemaps/maps-core.git", from: "2.4.0"),
+        .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: "2.4.0")
     ],
     targets: [
         .target(
@@ -55,10 +55,9 @@ let package = Package(
                 .product(name: "MapCoreSharedModuleCpp", package: "maps-core"),
             ],
             path: "shared",
-            sources: ["src"],
+            sources: ["src", "public"],
             publicHeadersPath: "public",
             cxxSettings: [
-                .headerSearchPath("**"),
                 .headerSearchPath("public"),
                 .headerSearchPath("src/config/layers"),
                 .headerSearchPath("src/config"),

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.1.0'
+  implementation 'ch.admin.geo.openswissmaps:openswissmaps-sdk:2.4.0'
 }
 ```
 Make sure you have mavenCentral() listed in your project repositories. 

diff --git a/android/build.gradle b/android/build.gradle
@@ -19,7 +19,7 @@ buildscript {
 	}
 
 	ext {
-		kotlin_version = "1.9.20"
+		kotlin_version = "1.9.21"
 
 		ubiqueUrl = System.getenv('UB_ARTIFACTORY_URL_ANDROID') ?: readPropertyWithDefault('ubiqueMavenUrl', '')
 		ubiqueUser = System.getenv('UB_ARTIFACTORY_USERNAME') ?: readPropertyWithDefault('ubiqueMavenUser', '')
@@ -42,7 +42,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:8.1.4'
+		classpath 'com.android.tools.build:gradle:8.2.2'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 		classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3'
@@ -188,8 +188,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.3.0"
-	api "io.openmobilemaps:layer-gps:2.3.0"
+	api "io.openmobilemaps:mapscore:2.4.0"
+	api "io.openmobilemaps:layer-gps:2.4.0"
 	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.3.0
-VERSION_CODE=2030000
+VERSION_NAME=2.4.0
+VERSION_CODE=2040000
 
 PUBLISH_VARIANT=release
 

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -13,4 +13,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
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.3.0"))
+    .package(url: "https://github.com/geoadmin/lib-open-swiss-maps-sdk.git", .upToNextMajor(from: "2.4.0"))
 ]
 ```