Skip to content

Upgrade to target 36 for Android, support flexible page sizes #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maurhofer-ubique merged 2 commits into from
Aug 27, 2025
Merged

Upgrade to target 36 for Android, support flexible page sizes #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a6c354
Upgrade to target 36 for Android, support flexible page sizes
maurhofer-ubique Aug 27, 2025
13cf595
Update ios.yml
stmitt Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ios

env:
XCODE_VERSION: 'Xcode_16.3'
XCODE_VERSION: 'Xcode_16.4'

on:
pull_request:
Expand All @@ -17,4 +17,4 @@ jobs:
- name: Switch to Xcode ${{ env.XCODE_VERSION }}
run: sudo xcode-select --switch /Applications/${{ env.XCODE_VERSION }}.app
- name: Build
run: xcodebuild -scheme SwisstopoMapSDK -destination 'platform=iOS Simulator,OS=18.0,name=iPhone 16 Pro'
run: xcodebuild -scheme SwisstopoMapSDK -destination 'platform=iOS Simulator,OS=18.6,name=iPhone 16 Pro'
12 changes: 6 additions & 6 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ apply plugin: 'com.vanniktech.maven.publish'
android {
namespace "ch.admin.geo.openswissmaps"

compileSdkVersion 35
compileSdkVersion 36

defaultConfig {
minSdkVersion 26
targetSdkVersion 35
targetSdkVersion 36
versionCode Integer.parseInt(VERSION_CODE)
versionName VERSION_NAME

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
externalNativeBuild {
cmake {
arguments "-DANDROID_STL=c++_shared"
arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
cppFlags "-std=c++17 -frtti -fexceptions -O2"
}
}
Expand Down Expand Up @@ -184,16 +184,16 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "androidx.annotation:annotation:1.9.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.9.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.9.2"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"

api "io.openmobilemaps:mapscore:3.4.1"
api "io.openmobilemaps:layer-gps:3.4.0"
implementation "ch.ubique.android:djinni-support-lib:1.1.1"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
}

clean.doLast {
Expand Down