Merge pull request #169 from geoadmin/release/3.0.0-rc.3

Release 3.0.0-rc.3

.github/workflows/android.yml

@@ -20,6 +20,6 @@ jobs:
       - name: Build with Gradle
         env:
           UB_ARTIFACTORY_URL_ANDROID: ${{secrets.UBIQUE_ARTIFACTORY_URL}}
-          UB_ARTIFACTORY_USERNAME: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
+          UB_ARTIFACTORY_USER: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
           UB_ARTIFACTORY_PASSWORD: ${{secrets.UBIQUE_ARTIFACTORY_PASS}}
         run: cd android; chmod 0777 gradlew; ./gradlew assembleDebug -P'android.injected.build.abi=arm64-v8a'

.github/workflows/sonatype.yml

@@ -38,7 +38,7 @@ jobs:
           SIGNING_KEY_ID: ${{secrets.MAVEN_SIGNING_KEY_ID}}
           SIGNING_KEY_PASSWORD: ${{secrets.MAVEN_SIGNING_KEY_PASSPHRASE}}
           UB_ARTIFACTORY_URL_ANDROID: ${{secrets.UBIQUE_ARTIFACTORY_URL}}
-          UB_ARTIFACTORY_USERNAME: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
+          UB_ARTIFACTORY_USER: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
           UB_ARTIFACTORY_PASSWORD: ${{secrets.UBIQUE_ARTIFACTORY_PASS}}
         run: |
           cd android
@@ -55,7 +55,7 @@ jobs:
           SONATYPE_NEXUS_USERNAME: ${{secrets.SONATYPE_NEXUS_USERNAME}}
           SONATYPE_NEXUS_PASSWORD: ${{secrets.SONATYPE_NEXUS_PASSWORD}}
           UB_ARTIFACTORY_URL_ANDROID: ${{secrets.UBIQUE_ARTIFACTORY_URL}}
-          UB_ARTIFACTORY_USERNAME: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
+          UB_ARTIFACTORY_USER: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
           UB_ARTIFACTORY_PASSWORD: ${{secrets.UBIQUE_ARTIFACTORY_PASS}}
         run: |
           cd android

CHANGELOG.md

@@ -1,8 +1,10 @@
 # Open Swiss Maps SDK
 
 ## Version 3.0.0
-- Update [mapscore to 3.0.0-rc.2](https://github.com/openmobilemaps/maps-core/releases/tag/3.0.0-rc.2)
-- Update [gps-layer to 3.0.0-rc.2](https://github.com/openmobilemaps/layer-gps/releases/tag/3.0.0-rc.2)
+- Update [mapscore to 3.0.0-rc.3](https://github.com/openmobilemaps/maps-core/releases/tag/3.0.0-rc.3)
+- Update [gps-layer to 3.0.0-rc.3](https://github.com/openmobilemaps/layer-gps/releases/tag/3.0.0-rc.3)
+- [Package.swift](Package.swift)
+- Update to AGP 8.7.2 and Kotlin 2.0.21
 
 ## Version 2.6.2
 - Update [mapscore to 2.6.2](https://github.com/openmobilemaps/maps-core/releases/tag/2.6.2)

Package.swift

@@ -22,8 +22,8 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/openmobilemaps/maps-core", from: .init(stringLiteral: "3.0.0-rc.2")),
-        .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: .init(stringLiteral: "3.0.0-rc.2"))
+        .package(url: "https://github.com/openmobilemaps/maps-core", from: .init(stringLiteral: "3.0.0-rc.3")),
+        .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: .init(stringLiteral: "3.0.0-rc.3"))
     ],
     targets: [
         .target(

android/build.gradle

@@ -19,11 +19,11 @@ buildscript {
 	}
 
 	ext {
-		agp_version = "8.6.1"
-		kotlin_version = "2.0.20"
+		agp_version = "8.7.2"
+		kotlin_version = "2.0.21"
 
 		ubiqueUrl = System.getenv('UB_ARTIFACTORY_URL_ANDROID') ?: readPropertyWithDefault('ubiqueMavenUrl', '')
-		ubiqueUser = System.getenv('UB_ARTIFACTORY_USERNAME') ?: readPropertyWithDefault('ubiqueMavenUser', '')
+		ubiqueUser = System.getenv('UB_ARTIFACTORY_USER') ?: readPropertyWithDefault('ubiqueMavenUser', '')
 		ubiquePass = System.getenv('UB_ARTIFACTORY_PASSWORD') ?: readPropertyWithDefault('ubiqueMavenPass', '')
 		ubiqueMaven = {
 			url = ubiqueUrl
@@ -46,7 +46,7 @@ buildscript {
 		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'
+		classpath 'com.vanniktech:gradle-maven-publish-plugin:0.30.0'
 		classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.10'
 	}
 }
@@ -77,7 +77,7 @@ android {
 		externalNativeBuild {
 			cmake {
 				arguments "-DANDROID_STL=c++_shared"
-				cppFlags "-std=c++17 -frtti -fexceptions -O0 "
+				cppFlags "-std=c++17 -frtti -fexceptions -O2"
 			}
 		}
 	}
@@ -185,17 +185,17 @@ mavenPublishing {
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-	implementation "androidx.annotation:annotation:1.7.0"
-	implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
-	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
+	implementation "androidx.annotation:annotation:1.9.1"
+	implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
+	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
 
-	api "io.openmobilemaps:mapscore:3.0.0-rc.2"
-	api "io.openmobilemaps:layer-gps:3.0.0-rc.2"
+	api "io.openmobilemaps:mapscore:3.0.0-rc.3"
+	api "io.openmobilemaps:layer-gps:3.0.0-rc.3"
 	implementation "ch.ubique.android:djinni-support-lib:1.0.9"
 
 	testImplementation 'junit:junit:4.13.2'
-	androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-	androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+	androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
 
 clean.doLast {

android/gradle.properties

@@ -29,7 +29,7 @@ android.enableR8.fullMode=false
 GROUP=ch.admin.geo.openswissmaps
 POM_ARTIFACT_ID=openswissmaps-sdk
 
-VERSION_NAME=3.0.0-rc.2
+VERSION_NAME=3.0.0-rc.3
 VERSION_CODE=3000000
 
 PUBLISH_VARIANT=release

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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip