From acaa9495e835b3544e4fce55c1ce9226eb85dd04 Mon Sep 17 00:00:00 2001
From: PaulLabruyere <paul.labruyere@picardie-nature.org>
Date: Tue, 24 Sep 2024 14:12:48 +0200
Subject: [PATCH 1/6] fix(PnX-SI#264): name permissions from applicationId
 (#265)

---
 occtax/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/occtax/src/main/AndroidManifest.xml b/occtax/src/main/AndroidManifest.xml
index 55188ba..1f74015 100644
--- a/occtax/src/main/AndroidManifest.xml
+++ b/occtax/src/main/AndroidManifest.xml
@@ -78,8 +78,8 @@
             android:name="fr.geonature.commons.data.MainContentProvider"
             android:authorities="${applicationId}.provider"
             android:exported="true"
-            android:readPermission="@string/permission_read"
-            android:writePermission="@string/permission_write" />
+            android:readPermission="${applicationId}.provider.permission.READ"
+            android:writePermission="${applicationId}.provider.permission.WRITE" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.file.provider"

From eb43c02400279fb00436c290472ca321fa164a87 Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Sun, 20 Oct 2024 18:25:41 +0200
Subject: [PATCH 2/6] chore: migrate to version catalog, upgrade core and maps
 module dependencies

---
 .idea/gradle.xml                              |  3 +-
 .idea/kotlinc.xml                             |  2 +-
 build.gradle                                  | 48 +++-------
 gn_mobile_core                                |  2 +-
 gn_mobile_maps                                |  2 +-
 gradle/libs.versions.toml                     | 90 +++++++++++++++++++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 occtax/build.gradle                           | 81 ++++++++---------
 occtax/src/main/AndroidManifest.xml           | 10 ++-
 .../fr/geonature/occtax/MainApplication.kt    |  5 +-
 .../occtax/ui/dataset/DatasetListFragment.kt  |  1 +
 .../ObservationRecordRecyclerViewAdapter.kt   |  4 +-
 .../ui/home/ObservationRecordsListFragment.kt |  3 +
 .../ui/home/ObservationRecordsMapFragment.kt  |  7 +-
 .../ui/input/InputPagerFragmentActivity.kt    |  2 +-
 .../counting/EditCountingMetadataActivity.kt  |  2 +
 .../ui/input/counting/MediaListActivity.kt    |  2 +
 .../occtax/ui/input/map/InputMapFragment.kt   |  3 +
 .../input/summary/InputTaxaSummaryFragment.kt |  3 +
 .../ui/input/taxa/TaxaFilterActivity.kt       |  6 +-
 .../occtax/ui/input/taxa/TaxaFragment.kt      |  2 +
 .../ui/observers/InputObserverListFragment.kt |  2 +
 .../occtax/ui/settings/PreferencesFragment.kt | 16 ++--
 .../ui/shared/view/ListItemActionView.kt      |  2 +-
 settings.gradle                               | 25 +++++-
 25 files changed, 219 insertions(+), 106 deletions(-)
 create mode 100644 gradle/libs.versions.toml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8656a1d..c4a69ab 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,8 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 2b8a50f..c224ad5 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.0" />
+    <option name="version" value="2.0.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index cea15c3..d4944a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,46 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-buildscript {
-    ext.klint_version = '11.3.1'
-    ext.kotlin_version = '1.8.0'
-    ext.androidx_hilt_version = '1.0.0'
-    ext.hilt_version = '2.44'
-    ext.retrofit_version = '2.9.0'
-    ext.room_version = '2.5.1'
-    ext.tinylog_version = '2.4.1'
-
-    repositories {
-        google()
-        mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 plugins {
-    id 'com.google.dagger.hilt.android' version "$hilt_version" apply false
-    id 'org.jlleitschuh.gradle.ktlint' version "$klint_version"
-    id 'org.jlleitschuh.gradle.ktlint-idea' version "$klint_version"
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    apply plugin: "org.jlleitschuh.gradle.ktlint"
-    apply plugin: "org.jlleitschuh.gradle.ktlint-idea"
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.dagger.hilt.android) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.parcelize) apply false
+    alias(libs.plugins.kapt) apply false
+    // TODO: Dagger’s KSP support is currently in alpha, see: https://dagger.dev/dev-guide/ksp
+    // alias(libs.plugins.ksp) apply false
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }
 
 private File loadVersionPropertiesFile(String moduleName) {
diff --git a/gn_mobile_core b/gn_mobile_core
index a2e3112..637f7ff 160000
--- a/gn_mobile_core
+++ b/gn_mobile_core
@@ -1 +1 @@
-Subproject commit a2e3112b6519e63da7b2eeb459e20400689634c6
+Subproject commit 637f7ff30c67cffe416cfd8398cf4d45ab6134ee
diff --git a/gn_mobile_maps b/gn_mobile_maps
index 3ccb428..1e2d9ae 160000
--- a/gn_mobile_maps
+++ b/gn_mobile_maps
@@ -1 +1 @@
-Subproject commit 3ccb428d0d8a934975cc4dc1b4f7b3c62f944ad8
+Subproject commit 1e2d9ae26b406bbb6bd4bf0ca6488e784d6e74da
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..87c99b9
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,90 @@
+[versions]
+activityKtx = "1.9.2"
+agp = "8.7.1"
+annotation = "1.8.2"
+appcompat = "1.7.0"
+cardview = "1.0.0"
+constraintlayout = "2.1.4"
+core = "1.6.1"
+coreKtx = "1.13.1"
+coreTesting = "2.2.0"
+fastscroll = "2.0.1"
+fragmentKtx = "1.8.4"
+hiltAndroid = "2.52"
+hiltWork = "1.2.0"
+jts = "1.20.0"
+junit = "4.13.2"
+junitKtx = "1.2.1"
+kapt = "2.0.21"
+# ksp = "2.0.20-1.0.24"
+kotlin = "2.0.21"
+kotlinxCoroutinesTest = "1.9.0"
+lifecycleCommon = "2.8.6"
+lifecycleLivedataKtx = "2.8.6"
+loggingInterceptor = "4.9.3"
+material = "1.12.0"
+mockk = "1.13.13"
+mockwebserver = "4.10.0"
+osmdroidAndroid = "6.1.20"
+preferenceKtx = "1.2.1"
+recyclerview = "1.3.2"
+retrofit = "2.9.0"
+robolectric = "4.13"
+room = "2.6.1"
+tinylog = "2.7.0"
+viewpager2 = "1.1.0"
+workRuntimeKtx = "2.9.1"
+
+[libraries]
+androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
+androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "cardview" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+androidx-core = { module = "androidx.test:core", version.ref = "core" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+androidx-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
+androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }
+androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltWork" }
+androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hiltWork" }
+androidx-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
+androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycleCommon" }
+androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
+androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleLivedataKtx" }
+androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
+androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
+androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
+androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
+androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
+androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
+androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
+androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "workRuntimeKtx" }
+converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+fastscroll = { module = "io.github.l4digital:fastscroll", version.ref = "fastscroll" }
+hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hiltAndroid" }
+hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hiltAndroid" }
+hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hiltAndroid" }
+jts-core = { module = "org.locationtech.jts:jts-core", version.ref = "jts" }
+junit = { module = "junit:junit", version.ref = "junit" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
+logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptor" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
+mockk-agent-jvm = { module = "io.mockk:mockk-agent-jvm", version.ref = "mockk" }
+mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "mockwebserver" }
+osmdroid-android = { module = "org.osmdroid:osmdroid-android", version.ref = "osmdroidAndroid" }
+retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+slf4j-tinylog = { module = "org.tinylog:slf4j-tinylog", version.ref = "tinylog" }
+tinylog-api-kotlin = { group = "org.tinylog", name = "tinylog-api-kotlin", version.ref = "tinylog" }
+tinylog-impl = { group = "org.tinylog", name = "tinylog-impl", version.ref = "tinylog" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+dagger-hilt-android = { id = "com.google.dagger.hilt.android" , version.ref = "hiltAndroid" }
+kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kapt" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize",  version.ref = "kotlin" }
+# TODO: Dagger’s KSP support is currently in alpha, see: https://dagger.dev/dev-guide/ksp
+# ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84ebdd7..7744a26 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/occtax/build.gradle b/occtax/build.gradle
index 9fd8a19..1a82e18 100644
--- a/occtax/build.gradle
+++ b/occtax/build.gradle
@@ -1,21 +1,22 @@
 plugins {
-    id 'com.android.application'
-    id 'dagger.hilt.android.plugin'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-parcelize'
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.dagger.hilt.android)
+    alias(libs.plugins.kapt)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.parcelize)
 }
 
 android {
-    compileSdkVersion 33
+
+    namespace 'fr.geonature.occtax'
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     dependenciesInfo {
@@ -27,8 +28,9 @@ android {
 
     defaultConfig {
         applicationId "fr.geonature.occtax2"
+        compileSdk 34
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 3310
         versionName "2.7.0"
         buildConfigField "String", "BUILD_DATE", "\"" + new Date().getTime() + "\""
@@ -56,16 +58,15 @@ android {
         }
     }
 
-    flavorDimensions "version"
-    productFlavors {
-        generic {}
-    }
-
     testOptions {
         unitTests {
             includeAndroidResources = true
         }
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -77,33 +78,33 @@ dependencies {
     implementation project(':maps')
 
     // Hilt dependencies
-    implementation "androidx.hilt:hilt-work:$androidx_hilt_version"
-    implementation "com.google.dagger:hilt-android:$hilt_version"
-    kapt "androidx.hilt:hilt-compiler:$androidx_hilt_version"
-    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
-
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
-    implementation 'com.google.android.material:material:1.8.0'
-    implementation 'androidx.work:work-runtime-ktx:2.8.1'
-    implementation "io.github.l4digital:fastscroll:2.0.1"
+    implementation libs.androidx.hilt.work
+    implementation libs.hilt.android
+    kapt libs.androidx.hilt.compiler
+    kapt libs.hilt.android.compiler
+
+    implementation libs.androidx.cardview
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.lifecycle.livedata.ktx
+    implementation libs.androidx.preference.ktx
+    implementation libs.androidx.recyclerview
+    implementation libs.material
+    implementation libs.androidx.work.runtime.ktx
+    implementation libs.fastscroll
 
     // Logging
-    implementation "org.tinylog:tinylog-api-kotlin:$tinylog_version"
-    runtimeOnly "org.tinylog:tinylog-impl:$tinylog_version"
+    implementation libs.tinylog.api.kotlin
+    runtimeOnly libs.tinylog.impl
 
     // Testing dependencies
-    testImplementation 'androidx.arch.core:core-testing:2.2.0'
-    testImplementation 'androidx.test.ext:junit-ktx:1.1.5'
-    testImplementation 'androidx.work:work-testing:2.8.1'
-    testImplementation("com.squareup.okhttp3:mockwebserver:4.10.0")
-    testImplementation 'io.mockk:mockk:1.13.4'
-    testImplementation 'io.mockk:mockk-agent-jvm:1.13.4'
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
-    testImplementation 'org.robolectric:robolectric:4.9.2'
-    testImplementation "org.tinylog:slf4j-tinylog:$tinylog_version"
+    testImplementation libs.androidx.core.testing
+    testImplementation libs.androidx.junit.ktx
+    testImplementation libs.androidx.work.testing
+    testImplementation(libs.mockwebserver)
+    testImplementation libs.mockk
+    testImplementation libs.mockk.agent.jvm
+    testImplementation libs.junit
+    testImplementation libs.kotlinx.coroutines.test
+    testImplementation libs.robolectric
+    testImplementation libs.slf4j.tinylog
 }
diff --git a/occtax/src/main/AndroidManifest.xml b/occtax/src/main/AndroidManifest.xml
index 1f74015..53dbae3 100644
--- a/occtax/src/main/AndroidManifest.xml
+++ b/occtax/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="fr.geonature.occtax">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name=".MainApplication"
@@ -67,6 +66,11 @@
             android:label="@string/activity_counting_media_title"
             android:theme="@style/AppTheme.NoActionBar" />
 
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
+
         <!--+
            | remove the default initializer
            +-->
diff --git a/occtax/src/main/java/fr/geonature/occtax/MainApplication.kt b/occtax/src/main/java/fr/geonature/occtax/MainApplication.kt
index 159aa33..3944080 100644
--- a/occtax/src/main/java/fr/geonature/occtax/MainApplication.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/MainApplication.kt
@@ -47,12 +47,11 @@ class MainApplication : Application(), Configuration.Provider {
         checkInputsToSynchronize()
     }
 
-    override fun getWorkManagerConfiguration(): Configuration {
-        return Configuration
+    override val workManagerConfiguration: Configuration
+        get() = Configuration
             .Builder()
             .setWorkerFactory(workerFactory)
             .build()
-    }
 
     private fun configureLogger() {
         val directoryForLogs: File = FileUtils.getFile(
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt
index 8387e53..8c59548 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt
@@ -173,6 +173,7 @@ class DatasetListFragment : Fragment() {
         setHasOptionsMenu(true)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             android.R.id.home -> {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordRecyclerViewAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordRecyclerViewAdapter.kt
index 4fe4c2c..d09f80e 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordRecyclerViewAdapter.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordRecyclerViewAdapter.kt
@@ -109,7 +109,7 @@ class ObservationRecordRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapt
                         setIndicatorColor(
                             getColor(
                                 context,
-                                R.attr.colorOnPrimary
+                                com.google.android.material.R.attr.colorOnPrimary
                             )
                         )
                     }.indeterminateDrawable?.apply {
@@ -120,7 +120,7 @@ class ObservationRecordRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapt
                 setTextColor(
                     getColor(
                         context,
-                        R.attr.colorOnPrimary
+                        com.google.android.material.R.attr.colorOnPrimary
                     )
                 )
             }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordsListFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordsListFragment.kt
index 9008518..e2232c2 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordsListFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordsListFragment.kt
@@ -178,6 +178,7 @@ class ObservationRecordsListFragment : Fragment(R.layout.fragment_recycler_view_
         )
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onCreateOptionsMenu(
         menu: Menu,
         inflater: MenuInflater
@@ -199,6 +200,7 @@ class ObservationRecordsListFragment : Fragment(R.layout.fragment_recycler_view_
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
 
@@ -235,6 +237,7 @@ class ObservationRecordsListFragment : Fragment(R.layout.fragment_recycler_view_
             }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_sync -> {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordsMapFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordsMapFragment.kt
index 32fcfe9..1bb717d 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordsMapFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordsMapFragment.kt
@@ -167,6 +167,7 @@ class ObservationRecordsMapFragment : MapFragment() {
         )
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onCreateOptionsMenu(
         menu: Menu,
         inflater: MenuInflater
@@ -188,6 +189,7 @@ class ObservationRecordsMapFragment : MapFragment() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
 
@@ -224,6 +226,7 @@ class ObservationRecordsMapFragment : MapFragment() {
             }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_sync -> {
@@ -411,7 +414,7 @@ class ObservationRecordsMapFragment : MapFragment() {
                         setIndicatorColor(
                             getColor(
                                 context,
-                                R.attr.colorOnPrimary
+                                com.google.android.material.R.attr.colorOnPrimary
                             )
                         )
                     }.indeterminateDrawable?.apply {
@@ -422,7 +425,7 @@ class ObservationRecordsMapFragment : MapFragment() {
                 setTextColor(
                     getColor(
                         context,
-                        R.attr.colorOnPrimary
+                        com.google.android.material.R.attr.colorOnPrimary
                     )
                 )
             }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt
index 1bcbce0..44a27ea 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt
@@ -165,7 +165,7 @@ class InputPagerFragmentActivity : AbstractPagerFragmentActivity(),
                         ColorUtils.setAlphaComponent(
                             ThemeUtils.getColor(
                                 this,
-                                R.attr.colorOnSurface
+                                com.google.android.material.R.attr.colorOnSurface
                             ),
                             32
                         ),
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt
index 45c89ff..753d333 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt
@@ -94,7 +94,9 @@ class EditCountingMetadataActivity : AppCompatActivity(),
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
+        super.onBackPressed()
         confirmBeforeQuit()
     }
 
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/MediaListActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/MediaListActivity.kt
index c7e357c..096be94 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/MediaListActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/MediaListActivity.kt
@@ -218,7 +218,9 @@ class MediaListActivity : AppCompatActivity() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
+        super.onBackPressed()
         sendResult()
         finish()
     }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/map/InputMapFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/map/InputMapFragment.kt
index d8706a0..07297f1 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/map/InputMapFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/map/InputMapFragment.kt
@@ -113,6 +113,7 @@ class InputMapFragment : MapFragment(),
         clearActiveSelection()
     }
 
+    @Deprecated("Deprecated in Java")
     @SuppressLint("RestrictedApi")
     override fun onCreateOptionsMenu(
         menu: Menu,
@@ -137,6 +138,7 @@ class InputMapFragment : MapFragment(),
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
 
@@ -167,6 +169,7 @@ class InputMapFragment : MapFragment(),
             }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_map_settings -> {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryFragment.kt
index af0e602..87965e9 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryFragment.kt
@@ -238,6 +238,7 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onCreateOptionsMenu(
         menu: Menu,
         inflater: MenuInflater
@@ -260,6 +261,7 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
 
@@ -267,6 +269,7 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
         dateMenuItem.isVisible = dateSettings.endDateSettings != null
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_date -> {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFilterActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFilterActivity.kt
index 34e16bf..70a5076 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFilterActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFilterActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
+import fr.geonature.compat.content.getParcelableArrayExtraCompat
 import fr.geonature.occtax.features.settings.domain.AppSettings
 
 /**
@@ -28,8 +29,7 @@ class TaxaFilterActivity : AppCompatActivity(), TaxaFilterFragment.OnTaxaFilterF
 
         if (savedInstanceState == null) {
             selectedFilters.addAll(
-                intent.getParcelableArrayExtra(EXTRA_SELECTED_FILTERS)?.map { it as Filter<*> }
-                    ?.toTypedArray() ?: emptyArray()
+                intent.getParcelableArrayExtraCompat<Filter<*>>(EXTRA_SELECTED_FILTERS) ?: emptyArray()
             )
 
             supportFragmentManager.beginTransaction()
@@ -61,7 +61,9 @@ class TaxaFilterActivity : AppCompatActivity(), TaxaFilterFragment.OnTaxaFilterF
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
+        super.onBackPressed()
         setResultAndFinish()
     }
 
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt
index 9b53889..bae9ab7 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt
@@ -333,6 +333,7 @@ class TaxaFragment : AbstractInputFragment() {
         super.onSaveInstanceState(savedState.apply { putAll(outState) })
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onCreateOptionsMenu(
         menu: Menu,
         inflater: MenuInflater
@@ -373,6 +374,7 @@ class TaxaFragment : AbstractInputFragment() {
         })
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_filter -> {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListFragment.kt
index eeeede9..8f76e1c 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListFragment.kt
@@ -230,6 +230,7 @@ class InputObserverListFragment : Fragment() {
         super.onSaveInstanceState(savedState.apply { putAll(outState) })
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onCreateOptionsMenu(
         menu: Menu,
         inflater: MenuInflater
@@ -250,6 +251,7 @@ class InputObserverListFragment : Fragment() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             android.R.id.home -> {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt
index 7b2e19b..1653c9d 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt
@@ -173,10 +173,10 @@ class PreferencesFragment : PreferenceFragmentCompat() {
         savedInstanceState: Bundle?,
         rootKey: String?
     ) {
-        addPreferencesFromResource(R.xml.preferences_servers)
+        addPreferencesFromResource(fr.geonature.datasync.R.xml.preferences_servers)
         addPreferencesFromResource(R.xml.preferences_dataset)
         addPreferencesFromResource(R.xml.preferences_observers)
-        addPreferencesFromResource(R.xml.map_preferences)
+        addPreferencesFromResource(fr.geonature.maps.R.xml.map_preferences)
         addPreferencesFromResource(R.xml.preferences_permissions)
         addPreferencesFromResource(R.xml.preferences_notifications)
         addPreferencesFromResource(R.xml.preferences_storage)
@@ -241,13 +241,13 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 
     private fun setServerUrlsPreferences(serverUrls: IGeoNatureAPIClient.ServerUrls?) {
         val serverSettingsPreference: Preference =
-            preferenceScreen.findPreference(getString(R.string.preference_category_server_geonature_url_key))
+            preferenceScreen.findPreference(getString(fr.geonature.datasync.R.string.preference_category_server_geonature_url_key))
                 ?: return
 
         val serverUrl =
             PreferenceManager.getDefaultSharedPreferences(serverSettingsPreference.context)
                 .getString(
-                    getString(R.string.preference_category_server_geonature_url_key),
+                    getString(fr.geonature.datasync.R.string.preference_category_server_geonature_url_key),
                     serverUrls?.geoNatureBaseUrl
                 )
 
@@ -264,7 +264,7 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                                 .edit()
                                 .also {
                                     it.putString(
-                                        getString(R.string.preference_category_server_geonature_url_key),
+                                        getString(fr.geonature.datasync.R.string.preference_category_server_geonature_url_key),
                                         url
                                     )
 
@@ -287,11 +287,11 @@ class PreferencesFragment : PreferenceFragmentCompat() {
             .edit()
             .also {
                 if (serverUrl.isNullOrBlank()) {
-                    it.remove(getString(R.string.preference_category_server_geonature_url_key))
-                    serverSettingsPreference.setSummary(R.string.preference_category_server_geonature_url_not_set)
+                    it.remove(getString(fr.geonature.datasync.R.string.preference_category_server_geonature_url_key))
+                    serverSettingsPreference.setSummary(fr.geonature.datasync.R.string.preference_category_server_geonature_url_not_set)
                 } else {
                     it.putString(
-                        getString(R.string.preference_category_server_geonature_url_key),
+                        getString(fr.geonature.datasync.R.string.preference_category_server_geonature_url_key),
                         serverUrl
                     )
                     serverSettingsPreference.summary = serverUrl
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ListItemActionView.kt b/occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ListItemActionView.kt
index 6cef954..529f566 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ListItemActionView.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ListItemActionView.kt
@@ -110,7 +110,7 @@ open class ListItemActionView : ConstraintLayout {
 
     fun setVisibleItems(visibleItems: Int = 1) {
         val typedArray =
-            context.theme.obtainStyledAttributes(intArrayOf(R.attr.listPreferredItemHeight))
+            context.theme.obtainStyledAttributes(intArrayOf(com.google.android.material.R.attr.listPreferredItemHeight))
         val listPreferredItemHeight = typedArray.getDimension(
             0,
             0f
diff --git a/settings.gradle b/settings.gradle
index dbc0415..6d100f7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,24 @@
-include ':commons', ':compat', ':datasync', ':maps', ':mountpoint', ':viewpager', ':occtax'
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "Occtax mobile"
+include ':commons', ':compat', ':datasync', ':maps', ':mountpoint', ':viewpager', ':occtax'
\ No newline at end of file

From 97119df16b2a147f246cdc44e3c2596df0856fc8 Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Mon, 21 Oct 2024 21:14:09 +0200
Subject: [PATCH 3/6] chore: 2.7.1-rc0 pre-release

---
 .idea/.name         |   1 +
 CHANGELOG.md        | 116 ++++++++++++++++++++++++++------------------
 occtax/build.gradle |   4 +-
 3 files changed, 71 insertions(+), 50 deletions(-)
 create mode 100644 .idea/.name

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..25281b7
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Occtax mobile
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d44761..627b894 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [2.7.1-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.0-rc9) (2024-10-21, pre-release)
+
+### 🚀 Nouveautés
+
+* Support Android 14 (API 34).
+
+### 🐛 Corrections
+
+* Pouvoir surcharger l'identifiant de l'application (https://github.com/PnX-SI/gn_mobile_occtax/issues/264).
+* Ajout d'un paramètre `shown_by_default` coté [module cartographique](https://github.com/PnX-SI/gn_mobile_maps/tree/develop/maps#layer-properties)
+  permettant d'afficher par défaut ou non les couches vectorielles. Par défaut, l'ensemble des
+  couches vectorielles déclarées sont affichées par défaut (https://github.com/PnX-SI/gn_mobile_occtax/issues/262).
+* Support des nouveaux fonds IGN (https://github.com/PnX-SI/gn_mobile_occtax/issues/267). 
+
+### ⚠️ Notes de version
+
+* Code de version : **3313**
+* Cette version nécessite la version [1.13.1 minimum de TaxHub](https://github.com/PnX-SI/TaxHub/releases/)
+  qui elle-même nécessite au minimum la version 2.14 de GeoNature.
+
 ## [2.7.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.0) (2024-07-13, release)
 
 ### 🚀 Nouveautés
@@ -70,7 +90,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3301
+* Code de version : **3301**
 * Cette version nécessite la version [1.13.1 de TaxHub](https://github.com/PnX-SI/TaxHub/releases/tag/1.13.1)
   qui elle même nécessite au minimum la version  2.14.1 de GeoNature (pas encore disponible).
 
@@ -102,7 +122,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3299
+* Code de version : **3299**
 * Cette version nécessite la version [1.13.1 de TaxHub](https://github.com/PnX-SI/TaxHub/releases/tag/1.13.1)
   qui elle même nécessite au minimum la version  2.14.1 de GeoNature (pas encore disponible).
 
@@ -116,7 +136,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3271
+* Code de version : **3271**
 * Cette version nécessite la version [1.13.1 de TaxHub](https://github.com/PnX-SI/TaxHub/releases/tag/1.13.1)
   qui elle même nécessite au minimum la version  2.14 de GeoNature (pas encore disponible).
 
@@ -129,7 +149,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3259
+* Code de version : **3259**
 * Cette version nécessite la version [1.13.1 de TaxHub](https://github.com/PnX-SI/TaxHub/releases/tag/1.13.1)
   qui elle même nécessite au minimum la version  2.14 de GeoNature (pas encore disponible).
 
@@ -142,7 +162,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3257
+* Code de version : **3257**
 * Cette version nécessite la version [1.13.1 de TaxHub](https://github.com/PnX-SI/TaxHub/releases/tag/1.13.1)
   qui elle même nécessite au minimum la version  2.14 de GeoNature (pas encore disponible).
 
@@ -154,7 +174,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3253
+* Code de version : **3253**
 * Cette version nécessite la version [1.13.1 de TaxHub](https://github.com/PnX-SI/TaxHub/releases/tag/1.13.1)
   qui elle même nécessite au minimum la version  2.14 de GeoNature (pas encore disponible).
 
@@ -169,7 +189,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3251
+* Code de version : **3251**
 * Cette version nécessite la version [1.13.1 de TaxHub](https://github.com/PnX-SI/TaxHub/releases/tag/1.13.1)
   qui elle même nécessite au minimum la version  2.14 de GeoNature (pas encore disponible).
 
@@ -186,7 +206,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3229
+* Code de version : **3229**
 
 ## [2.7.0-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.0-rc1) (2023-09-13, pre-release)
 
@@ -197,7 +217,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3221
+* Code de version : **3221**
 
 ## [2.7.0-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.0-rc0) (2023-09-03, pre-release)
 
@@ -217,7 +237,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3217
+* Code de version : **3217**
 
 ## [2.6.2](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.2) (2024-03-02, release)
 
@@ -227,7 +247,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3220
+* Code de version : **3220**
 
 ## [2.6.1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.1) (2023-05-24, release)
 
@@ -241,7 +261,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3210
+* Code de version : **3210**
 
 ## [2.6.1-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.1-rc1) (2023-05-16, pre-release)
 
@@ -251,7 +271,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3209
+* Code de version : **3209**
 
 ## [2.6.1-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.1-rc0) (2023-05-13, pre-release)
 
@@ -263,7 +283,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3203
+* Code de version : **3203**
 
 ## [2.6.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.0) (2023-05-08, release)
 
@@ -302,7 +322,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3200
+* Code de version : **3200**
 * Depuis sa version 2.12.0, GeoNature permet de gérer le contenu de la table
   `gn_commons.t_mobile_apps` directement dans le back-office du module "Admin" de GeoNature (https://github.com/PnX-SI/gn_mobile_occtax/issues/214)
 * Dans cette même version, les médias (incluant le dossier `mobile/` comprenant les fichiers APK et
@@ -331,7 +351,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3191
+* Code de version : **3191**
 
 ## [2.6.0-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.0-rc1) (2023-04-19, pre-release)
 
@@ -357,7 +377,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3187
+* Code de version : **3187**
 
 ## [2.6.0-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.0-rc0) (2023-03-25, pre-release)
 
@@ -373,7 +393,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3181
+* Code de version : **3181**
 
 ## [2.5.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.5.0) (2023-03-21, release)
 
@@ -394,7 +414,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3170
+* Code de version : **3170**
 * Nécessite la version 2.10 (ou plus) de GeoNature.
 * Suite à la refonte sur la partie gestion des relevés, le paramétrage de la nomenclature en
   configuration avancée a évolué aussi (cf. [README.md](https://github.com/PnX-SI/gn_mobile_occtax#nomenclature-settings)),
@@ -410,7 +430,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3163
+* Code de version : **3163**
 
 ## [2.4.1-rc3](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.1-rc3) (2023-02-15, pre-release)
 
@@ -420,7 +440,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3137
+* Code de version : **3137**
 
 ## [2.4.1-rc2](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.1-rc2) (2023-02-05, pre-release)
 
@@ -430,7 +450,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3121
+* Code de version : **3121**
 
 ## [2.4.1-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.1-rc1) (2023-02-04, pre-release)
 
@@ -440,7 +460,7 @@
 
 ### ⚠️ Notes de version
 
-* Code de version : 3119
+* Code de version : **3119**
 
 ## [2.4.1-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.1-rc0) (2023-01-25, pre-release)
 
@@ -453,7 +473,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3109
+* Code de version : **3109**
 
 ## [2.4.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.0) (2022-10-02, release)
 
@@ -488,7 +508,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3090
+* Code de version : **3090**
 
 ## [2.4.0-rc2](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.0-rc2) (2022-09-26, pre-release)
 
@@ -499,7 +519,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3083
+* Code de version : **3083**
 
 ## [2.4.0-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.0-rc1) (2022-09-10, pre-release)
 
@@ -510,7 +530,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3079
+* Code de version : **3079**
 
 ## [2.4.0-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.0-rc0) (2022-09-07, pre-release)
 
@@ -537,7 +557,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3075
+* Code de version : **3075**
 
 ## [2.3.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.3.0) (2022-07-14, release)
 
@@ -560,7 +580,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3070
+* Code de version : **3070**
 * L'application est officiellement compatible avec les terminaux tournant sur Android 8.0 au minimum.
 
 ## [2.3.0-rc4](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.3.0-rc4) (2022-07-13, pre-release)
@@ -572,7 +592,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3061
+* Code de version : **3061**
 
 ## [2.3.0-rc3](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.3.0-rc3) (2022-07-04, pre-release)
 
@@ -587,7 +607,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3049
+* Code de version : **3049**
 
 ## [2.3.0-rc2](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.3.0-rc2) (2022-06-29, pre-release)
 
@@ -602,7 +622,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3041
+* Code de version : **3041**
 
 ## [2.3.0-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.3.0-rc1) (2022-06-25, pre-release)
 
@@ -616,7 +636,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3037
+* Code de version : **3037**
 
 ## [2.3.0-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.3.0-rc0) (2022-06-21, pre-release)
 
@@ -635,7 +655,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3025
+* Code de version : **3025**
 * L'application est officiellement compatible avec les terminaux tournant sur Android 8.0 au minimum.
 
 ## [2.2.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.2.0) (2022-05-31, release)
@@ -663,7 +683,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3020
+* Code de version : **3020**
 
 ## [2.2.0-rc5](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.2.0-rc5) (2022-05-26, pre-release)
 
@@ -675,7 +695,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 3015
+* Code de version : **3015**
 
 ## [2.2.0-rc4](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.2.0-rc4) (2022-05-24, pre-release)
 
@@ -685,7 +705,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2985
+* Code de version : **2985**
 
 ## [2.2.0-rc3](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.2.0-rc3) (2022-05-24, pre-release)
 
@@ -697,7 +717,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2965
+* Code de version : **2965**
 
 ## [2.2.0-rc2](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.2.0-rc2) (2022-05-23, pre-release)
 
@@ -711,7 +731,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2945
+* Code de version : **2945**
 
 ## [2.2.0-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.2.0-rc1) (2022-05-18, pre-release)
 
@@ -726,7 +746,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2905
+* Code de version : **2905**
 
 ## [2.2.0-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.2.0-rc0) (2022-05-16, pre-release)
 
@@ -739,7 +759,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2870
+* Code de version : **2870**
 
 ## [2.1.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.1.0) (2022-05-05, release)
 
@@ -767,7 +787,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2680
+* Code de version : **2680**
 * Le paramètre `uh_application_id` a été renommé `gn_application_id`. L'ancien nom du paramètre
   fonctionne toujours mais est déprécié. Il est donc conseillé de le renommer dans le fichier de
   paramétrage (`settings.json` côté GeoNature).
@@ -781,7 +801,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2675
+* Code de version : **2675**
 
 ## [2.1.0-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.1.0-rc0) (2022-05-03, pre-release)
 
@@ -809,7 +829,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2670
+* Code de version : **2670**
 * Le paramètre `uh_application_id` a été renommé `gn_application_id`. L'ancien nom du paramètre
   fonctionne toujours mais est déprécié. Il est donc conseillé de le renommer dans le fichier de
   paramétrage (`settings.json` côté GeoNature).
@@ -822,7 +842,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2580
+* Code de version : **2580**
 
 ## [2.0.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.0.0) (2022-03-22, release)
 
@@ -836,7 +856,7 @@ dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 
 ### ⚠️ Notes de version
 
-* Code de version : 2570
+* Code de version : **2570**
 
 *Coté serveur pour les administrateurs :*
 
@@ -868,7 +888,7 @@ A partir de la version 2 d'Occtax-mobile, une seule application est nécessaire
 
 * Cette version n'est compatible qu'avec les versions 2.5.x, 2.6.x et 2.7.5 (et plus) de GeoNature et ne fonctionne qu'avec la version [1.3.x](https://github.com/PnX-SI/gn_mobile_core/releases/tag/1.3.0) de "Sync".
 * Il est nécessaire de synchroniser tous les relevés en cours sur les terminaux avant d'effectuer la mise à jour. 
-* Code de version : 2350
+* Code de version : **2350**
 
 ## [1.3.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/1.3.0) (2021-07-29, release)
 
@@ -880,4 +900,4 @@ A partir de la version 2 d'Occtax-mobile, une seule application est nécessaire
 
 * Cette version n'est compatible qu'avec les versions 2.5.x, 2.6.x et 2.7.5 (et plus) de GeoNature et ne fonctionne qu'avec la version [1.3.x](https://github.com/PnX-SI/gn_mobile_core/releases/tag/1.3.0) de "Sync".
 * Il est nécessaire de synchroniser tous les relevés en cours sur les terminaux avant d'effectuer la mise à jour. 
-* Code de version : 2290
+* Code de version : **2290**
diff --git a/occtax/build.gradle b/occtax/build.gradle
index 1a82e18..7c1b5e4 100644
--- a/occtax/build.gradle
+++ b/occtax/build.gradle
@@ -31,8 +31,8 @@ android {
         compileSdk 34
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 3310
-        versionName "2.7.0"
+        versionCode 3313
+        versionName "2.7.1-rc0"
         buildConfigField "String", "BUILD_DATE", "\"" + new Date().getTime() + "\""
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         archivesBaseName = project.name + "-" + versionName

From 6aa7d61f3b083b63c68ba8e67f4691ea35df069e Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Sat, 16 Nov 2024 10:07:08 +0100
Subject: [PATCH 4/6] chore: 2.7.1-rc1 pre-release

---
 .idea/inspectionProfiles/ktlint.xml |  3 ++-
 CHANGELOG.md                        | 16 +++++++++++++++-
 gn_mobile_core                      |  2 +-
 occtax/build.gradle                 |  4 ++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.idea/inspectionProfiles/ktlint.xml b/.idea/inspectionProfiles/ktlint.xml
index 7d04a74..519da9b 100644
--- a/.idea/inspectionProfiles/ktlint.xml
+++ b/.idea/inspectionProfiles/ktlint.xml
@@ -1,7 +1,8 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="ktlint" />
+    <inspection_tool class="AndroidLintUnsafeImplicitIntentLaunch" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="KotlinUnusedImport" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
   </profile>
-</component>
+</component>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 627b894..8395e60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Changelog
 
-## [2.7.1-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.0-rc9) (2024-10-21, pre-release)
+## [2.7.1-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.1-rc1) (2024-11-16, pre-release)
+
+### 🐛 Corrections
+
+* Erreur lors de la synchronisation des champs additionnels, certains champs additionnels peuvent
+  être rattachés à des jeux de données non présents lors de la synchronisation. Ces champs
+  additionnels sont donc tout simplement ignorés lors de la synchronisation des données (https://github.com/PnX-SI/gn_mobile_occtax/issues/269).
+
+### ⚠️ Notes de version
+
+* Code de version : **3319**
+* Cette version nécessite la version [1.13.1 minimum de TaxHub](https://github.com/PnX-SI/TaxHub/releases/)
+  qui elle-même nécessite au minimum la version 2.14 de GeoNature.
+
+## [2.7.1-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.1-rc0) (2024-10-21, pre-release)
 
 ### 🚀 Nouveautés
 
diff --git a/gn_mobile_core b/gn_mobile_core
index 637f7ff..b875a18 160000
--- a/gn_mobile_core
+++ b/gn_mobile_core
@@ -1 +1 @@
-Subproject commit 637f7ff30c67cffe416cfd8398cf4d45ab6134ee
+Subproject commit b875a18986fd9476dfd93191aa2507ee7394883e
diff --git a/occtax/build.gradle b/occtax/build.gradle
index 7c1b5e4..9e41bb4 100644
--- a/occtax/build.gradle
+++ b/occtax/build.gradle
@@ -31,8 +31,8 @@ android {
         compileSdk 34
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 3313
-        versionName "2.7.1-rc0"
+        versionCode 3319
+        versionName "2.7.1-rc1"
         buildConfigField "String", "BUILD_DATE", "\"" + new Date().getTime() + "\""
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         archivesBaseName = project.name + "-" + versionName

From a2df18b643390014b0427bdbccfe35e101168516 Mon Sep 17 00:00:00 2001
From: Camille Monchicourt <camille.monchicourt@ecrins-parcnational.fr>
Date: Sun, 17 Nov 2024 14:19:19 +0100
Subject: [PATCH 5/6] CHANGELOG 2.7.1 (#273)

CHANGELOG 2.7.1
---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8395e60..86deba4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## 2.7.1 (unreleased)
+
+### 🚀 Nouveautés
+
+* Support d'Android 14 (API 34).
+* Ajout d'un paramètre `shown_by_default` coté [module cartographique](https://github.com/PnX-SI/gn_mobile_maps/tree/develop/maps#layer-properties)
+  permettant d'afficher par défaut ou non les couches vectorielles. Par défaut, l'ensemble des
+  couches vectorielles déclarées sont affichées par défaut (https://github.com/PnX-SI/gn_mobile_occtax/issues/262).
+* Support des nouvelles URL des fonds IGN en ligne (https://github.com/PnX-SI/gn_mobile_occtax/issues/267).
+* Possibilité de surcharger l'identifiant de l'application (https://github.com/PnX-SI/gn_mobile_occtax/issues/264).
+
+### 🐛 Corrections
+
+* Correction d'une erreur lors de la synchronisation des champs additionnels, certains champs additionnels peuvent
+  être rattachés à des jeux de données non présents lors de la synchronisation. Ces champs
+  additionnels sont donc tout simplement ignorés lors de la synchronisation des données (https://github.com/PnX-SI/gn_mobile_occtax/issues/269).
+
+### ⚠️ Notes de version
+
+* Code de version : **xxxx**
+* Cette version nécessite la version [1.14.2 minimum de TaxHub](https://github.com/PnX-SI/TaxHub/releases/)
+  qui elle-même nécessite au minimum la version 2.14 de GeoNature.
+
 ## [2.7.1-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.1-rc1) (2024-11-16, pre-release)
 
 ### 🐛 Corrections

From c56255284de46ea441c991b96b4a9d3f4b946329 Mon Sep 17 00:00:00 2001
From: "S. Grimault" <sebastien.grimault@gmail.com>
Date: Sun, 17 Nov 2024 14:30:48 +0100
Subject: [PATCH 6/6] chore: 2.7.1 release

---
 CHANGELOG.md        | 10 +++++-----
 occtax/build.gradle |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86deba4..7afbf66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2.7.1 (unreleased)
+## [2.7.1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.7.1) (2024-11-17, release)
 
 ### 🚀 Nouveautés
 
@@ -13,13 +13,13 @@
 
 ### 🐛 Corrections
 
-* Correction d'une erreur lors de la synchronisation des champs additionnels, certains champs additionnels peuvent
-  être rattachés à des jeux de données non présents lors de la synchronisation. Ces champs
-  additionnels sont donc tout simplement ignorés lors de la synchronisation des données (https://github.com/PnX-SI/gn_mobile_occtax/issues/269).
+* Correction d'une erreur lors de la synchronisation des champs additionnels, certains champs
+  additionnels peuvent être rattachés à des jeux de données non présents lors de la synchronisation.
+  Ces champs additionnels sont donc tout simplement ignorés lors de la synchronisation des données (https://github.com/PnX-SI/gn_mobile_occtax/issues/269).
 
 ### ⚠️ Notes de version
 
-* Code de version : **xxxx**
+* Code de version : **3320**
 * Cette version nécessite la version [1.14.2 minimum de TaxHub](https://github.com/PnX-SI/TaxHub/releases/)
   qui elle-même nécessite au minimum la version 2.14 de GeoNature.
 
diff --git a/occtax/build.gradle b/occtax/build.gradle
index 9e41bb4..402d657 100644
--- a/occtax/build.gradle
+++ b/occtax/build.gradle
@@ -31,8 +31,8 @@ android {
         compileSdk 34
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 3319
-        versionName "2.7.1-rc1"
+        versionCode 3320
+        versionName "2.7.1"
         buildConfigField "String", "BUILD_DATE", "\"" + new Date().getTime() + "\""
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         archivesBaseName = project.name + "-" + versionName