Merge pull request #193 from openmobilemaps/release/2.4.0

Release 2.4.0

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog for Open Mobile Maps
 
+## Version 2.4.0 
+- Update and adjust to [mapscore 2.4.0](https://github.com/openmobilemaps/maps-core/releases/tag/2.4.0)
+- Update AGP and Kotlin versions for Android
+- Fix of iOS include path
+
 ## Version 2.3.0 
 - Update and adjust to [mapscore 2.3.0](https://github.com/openmobilemaps/maps-core/releases/tag/2.3.0)
 

Package.resolved

@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/openmobilemaps/maps-core.git",
         "state": {
           "branch": null,
-          "revision": "9af34563358f90ced1f3d531375af1d7775bf0dd",
-          "version": "2.3.0"
+          "revision": "b2e8a8d3aaacc53b2ebcaaaa84afe4d0dfde5de2",
+          "version": "2.4.0"
         }
       },
       {

Package.swift

@@ -23,7 +23,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/openmobilemaps/maps-core.git", from: "2.3.0"),
+        .package(url: "https://github.com/openmobilemaps/maps-core.git", from: "2.4.0"),
         .package(url: "https://github.com/UbiqueInnovation/ubkit-ios", from: "1.8.1"),
     ],
     targets: [
@@ -55,11 +55,11 @@ let package = Package(
                 .product(name: "MapCoreSharedModuleCpp", package: "maps-core"),
             ],
             path: "shared",
-            sources: ["src"],
+            sources: ["src", "public"],
             publicHeadersPath: "public",
             cxxSettings: [
-                .headerSearchPath("**"),
                 .headerSearchPath("public"),
+                .headerSearchPath("src"),
                 .headerSearchPath("src/gps"),
             ]
         ),

android/README.md

@@ -36,7 +36,7 @@ This module is designed to be used together with Open Mobile Maps maps-core.
 To add the OpenSwissMaps SDK to your Android project, add the following line to your build.gradle
 
 ```groovy
-implementation 'io.openmobilemaps:layer-gps:2.3.0'
+implementation 'io.openmobilemaps:layer-gps:2.4.0'
 ```
 
 Make sure you have mavenCentral() listed in your project repositories. 

android/build.gradle

@@ -17,8 +17,8 @@ buildscript {
 	}
 
 	ext{
-		agp_version = "8.1.4"
-		kotlin_version = "1.9.20"
+		agp_version = "8.2.2"
+		kotlin_version = "1.9.21"
 
 		ubiqueUrl = System.getenv('UB_ARTIFACTORY_URL_ANDROID') ?: readPropertyWithDefault('ubiqueMavenUrl', '')
 		ubiqueUser = System.getenv('UB_ARTIFACTORY_USERNAME') ?: readPropertyWithDefault('ubiqueMavenUser', '')
@@ -41,7 +41,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath "com.android.tools.build:gradle:8.1.4"
+		classpath "com.android.tools.build:gradle:$agp_version"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 		classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3'
@@ -195,7 +195,7 @@ dependencies {
 	implementation 'androidx.core:core-ktx:1.12.0'
 	implementation 'com.google.android.gms:play-services-location:21.1.0'
 
-	api 'io.openmobilemaps:mapscore:2.3.0'
+	api 'io.openmobilemaps:mapscore:2.4.0'
 	implementation "ch.ubique.android:djinni-support-lib:1.0.7"
 
 	testImplementation 'junit:junit:4.13.2'

android/gradle.properties

@@ -31,8 +31,8 @@ SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/
 
 GROUP=io.openmobilemaps
 POM_ARTIFACT_ID=layer-gps
-VERSION_NAME=2.3.0
-VERSION_CODE=2030000
+VERSION_NAME=2.4.0
+VERSION_CODE=2040000
 PUBLISH_VARIANT=release
 
 POM_NAME=layer-gps

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

ios/README.md

@@ -37,7 +37,7 @@ Once you have your Swift package set up, adding Open Mobile Maps as a dependency
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/openmobilemaps/layer-gps.git", .upToNextMajor(from: "2.3.0"))
+    .package(url: "https://github.com/openmobilemaps/layer-gps.git", .upToNextMajor(from: "2.4.0"))
 ]
 ```