From 092ac3e71887522602e64114eb3ca081083cfc42 Mon Sep 17 00:00:00 2001 From: Christoph Maurhofer Date: Thu, 10 Jul 2025 16:51:34 +0200 Subject: [PATCH 1/3] Use guarded gps position for computing render position (cherry picked from commit 6b5ab18049de8ed489ad5fc2549d24d423bffa70) --- shared/src/gps/GpsLayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/src/gps/GpsLayer.cpp b/shared/src/gps/GpsLayer.cpp index 66752ce..c416fa6 100644 --- a/shared/src/gps/GpsLayer.cpp +++ b/shared/src/gps/GpsLayer.cpp @@ -722,7 +722,7 @@ std::vector GpsLayer::computeModelMatrix(bool scaleInvariant, double obje } // Translate to final position in 2d space - Coord renderCoord = mapInterface ? mapInterface->getCoordinateConverterHelper()->convertToRenderSystem(*position) : + Coord renderCoord = mapInterface ? mapInterface->getCoordinateConverterHelper()->convertToRenderSystem(*currentPosition) : Coord(CoordinateSystemIdentifiers::RENDERSYSTEM(), 0.0, 0.0, 0.0); std::vector trMatrix(16, 0); Matrix::setIdentityM(trMatrix, 0); From e041b1ac1dd65ace7d9b7cbab2c5e5324e6e5199 Mon Sep 17 00:00:00 2001 From: Christoph Maurhofer Date: Mon, 14 Jul 2025 11:48:22 +0200 Subject: [PATCH 2/3] Prepare for release 3.3.1 --- CHANGELOG.md | 4 ++++ Package.swift | 2 +- android/README.md | 2 +- android/gradle.properties | 4 ++-- ios/README.md | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f86f835..4216671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for Open Mobile Maps +## Version 3.3.1 +- Update and adjust to [mapscore 3.3.1](https://github.com/openmobilemaps/maps-core/releases/tag/3.3.1) +- Fixed a concurrency issue when updating/rendering the GPS position + ## Version 3.3.0 - Update and adjust to [mapscore 3.3.0](https://github.com/openmobilemaps/maps-core/releases/tag/3.3.0) diff --git a/Package.swift b/Package.swift index 04820be..d74ff5c 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/openmobilemaps/maps-core", .upToNextMajor(from: "3.3.0")), + .package(url: "https://github.com/openmobilemaps/maps-core", .upToNextMajor(from: "3.3.1")), .package(url: "https://github.com/UbiqueInnovation/ubkit-ios", .upToNextMajor(from: "2.0.0")), ], targets: [ diff --git a/android/README.md b/android/README.md index 50dd635..77be073 100644 --- a/android/README.md +++ b/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:3.3.0' +implementation 'io.openmobilemaps:layer-gps:3.3.1' ``` Make sure you have mavenCentral() listed in your project repositories. diff --git a/android/gradle.properties b/android/gradle.properties index e1a528d..abcf8aa 100644 --- a/android/gradle.properties +++ b/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=3.3.0 -VERSION_CODE=3030000 +VERSION_NAME=3.3.1 +VERSION_CODE=3030100 PUBLISH_VARIANT=release POM_NAME=layer-gps diff --git a/ios/README.md b/ios/README.md index af9bb22..ba9375d 100644 --- a/ios/README.md +++ b/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", from: .upToNextMajor(from: "3.3.0")) + .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: .upToNextMajor(from: "3.3.1")) ] ``` From da602360f7c1d527273530fac8013cbf14a311b4 Mon Sep 17 00:00:00 2001 From: Christoph Maurhofer Date: Thu, 10 Jul 2025 12:28:37 +0200 Subject: [PATCH 3/3] Update publishing plugin and maven central configuration (cherry picked from commit 5cf6040325e70443b1a2d1125e43e40f9ac77fd6) --- .github/workflows/sonatype.yml | 2 +- android/build.gradle | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sonatype.yml b/.github/workflows/sonatype.yml index 346cb14..41b91d2 100644 --- a/.github/workflows/sonatype.yml +++ b/.github/workflows/sonatype.yml @@ -60,7 +60,7 @@ jobs: run: | cd android echo "### Maven Dependency - Maven Central" >> $GITHUB_STEP_SUMMARY - ./gradlew publishAllPublicationsToMavenCentral -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/signingkey.gpg -Psigning.password=$SIGNING_KEY_PASSWORD -Psigning.keyId=$SIGNING_KEY_ID -PmavenCentralUsername=$SONATYPE_NEXUS_USERNAME -PmavenCentralPassword=$SONATYPE_NEXUS_PASSWORD + ./gradlew publishAndReleaseToMavenCentral -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/signingkey.gpg -Psigning.password=$SIGNING_KEY_PASSWORD -Psigning.keyId=$SIGNING_KEY_ID -PmavenCentralUsername=$SONATYPE_NEXUS_USERNAME -PmavenCentralPassword=$SONATYPE_NEXUS_PASSWORD echo "[Maven Central](https://search.maven.org/artifact/io.openmobilemaps/${{ steps.vars.outputs.artifactId }}/${{ steps.vars.outputs.version }}/aar)" >> $GITHUB_STEP_SUMMARY echo "| Git Commit | Artifact ID | Maven Version |" >> $GITHUB_STEP_SUMMARY echo "| --- | --- | --- |" >> $GITHUB_STEP_SUMMARY diff --git a/android/build.gradle b/android/build.gradle index 8357f94..f200a1f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -44,8 +44,8 @@ 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.30.0' - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.10' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.33.0' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:2.0.0' } } @@ -59,8 +59,6 @@ apply plugin : 'com.android.library' apply plugin : 'kotlin-android' apply plugin: 'com.vanniktech.maven.publish' -import com.vanniktech.maven.publish.SonatypeHost - android { namespace "io.openmobilemaps.gps" @@ -197,7 +195,7 @@ publishing { } mavenPublishing { - publishToMavenCentral(SonatypeHost.DEFAULT, true) + publishToMavenCentral(true) signAllPublications() }