[indexer] Use ICU regex to handle unicode characters in mastodon/bluesky domains

Improve regex, (ICU required for unicode character support) Also add tests for umlauts, add generated "Testing" folder to gitignore, and clean up url::UrlEncode a bit
TODO: android doesn't build
Signed-off-by: Harry Bond <me@hbond.xyz>

.clang-format

@@ -1,59 +1,48 @@
 # Configuration file for clang-format, based on docs/CPP_STYLE.md.
+
+---
 BasedOnStyle: Google
 
 AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignArrayOfStructures: Right
-AlignConsecutiveMacros: AcrossEmptyLinesAndComments
-AlignEscapedNewlines: LeftWithLastLine
 AlignOperands: AlignAfterOperator
 AllowShortBlocksOnASingleLine: Empty
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: true
 BraceWrapping:
   AfterCaseLabel: true
   AfterClass: true
   AfterControlStatement: Always
   AfterEnum: true
-  AfterExternBlock: true
   AfterFunction: true
   AfterNamespace: true
   AfterObjCDeclaration: true
   AfterStruct: true
   AfterUnion: true
+  AfterExternBlock: true
   BeforeCatch: true
   BeforeElse: true
   BeforeLambdaBody: true
   BeforeWhile: true
+  IndentBraces: false
   SplitEmptyFunction: false
-  SplitEmptyNamespace: false
   SplitEmptyRecord: false
-BinPackArguments: true
-BinPackParameters: true
-BreakAfterJavaFieldAnnotations: true
+  SplitEmptyNamespace: false
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 ColumnLimit: 120
 ConstructorInitializerIndentWidth: 2
-ContinuationIndentWidth: 4
+ContinuationIndentWidth: 2
 DerivePointerAlignment: false
 IncludeBlocks: Preserve
-IndentAccessModifiers: false
+IndentCaseLabels: false
 IndentExternBlock: NoIndent
-InsertBraces: false
 InsertNewlineAtEOF: true
-LambdaBodyIndentation: OuterScope
-PackConstructorInitializers: CurrentLine
+PackConstructorInitializers: Never
 PointerAlignment: Middle
-RemoveBracesLLVM: true
 QualifierAlignment: Right
 SpacesInContainerLiterals: false
 Standard: Latest
 TabWidth: 2
-
----
-Language: Java
-AllowShortFunctionsOnASingleLine: Empty
+UseTab: Never

.forgejo/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,5 +1,6 @@
 name: 🐞 Bug Report
 description: Report a problem you've encountered
+title: "bug: "
 labels:
   - bug
 body:
@@ -66,4 +67,4 @@ body:
       label: Additional context
       description: Add any other context or comments that may be useful.
     validations:
-      required: false
+      required: false

.forgejo/ISSUE_TEMPLATE/feature-request.yaml

@@ -1,5 +1,6 @@
 name: "💡 Feature Request"
 description: "Suggest an idea or improvement for CoMaps"
+title: "feat: "
 labels:
   - "enhancement"
 body:
@@ -43,4 +44,4 @@ body:
       label: "Additional context"
       description: "Any other context, comments, or screenshots to support your request."
     validations:
-      required: false
+      required: false

.forgejo/workflows/android-beta.yaml

@@ -32,12 +32,13 @@ on:
       - track_generator/**
       - xcode/**
 
+env:
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+
 jobs:
   android-google-beta:
     name: Android Google Beta
     runs-on: ubuntu-latest
-    container:
-      image: runmymind/docker-android-sdk:latest
     environment: beta
     steps:
       - name: Install build tools and dependencies
@@ -70,6 +71,10 @@ jobs:
           SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
           RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Compile
         shell: bash
         working-directory: android

.forgejo/workflows/android-check-metadata.yaml

@@ -11,7 +11,7 @@ on:
 jobs:
   android-check-metadata:
     name: Check app metadata
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.forgejo/workflows/android-check.yaml

@@ -34,12 +34,13 @@ on:
       - track_generator/**
       - xcode/**
 
+env:
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+
 jobs:
   lint:
     name: Android Lint
-    runs-on: codeberg-tiny
-    container:
-      image: runmymind/docker-android-sdk:latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -50,6 +51,10 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Lint
         shell: bash
         working-directory: android
@@ -58,8 +63,6 @@ jobs:
   android-check:
     name: Build Android Debug
     runs-on: ubuntu-latest
-    container:
-      image: runmymind/docker-android-sdk:latest
     strategy:
       fail-fast: false
       matrix:
@@ -90,6 +93,10 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.forgejo/workflows/android-monkey.yaml

@@ -4,9 +4,12 @@ on:
   schedule:
     - cron:  '0 5 * * 0' # Once per week at 05:00 UTC
 
+env:
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+
 jobs:
   precondition:
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-latest
     name: Check preconditions
     steps:
       - name: Checkout sources
@@ -31,8 +34,6 @@ jobs:
   android-google-beta:
     name: Android Google Beta
     runs-on: ubuntu-latest
-    container:
-      image: runmymind/docker-android-sdk:latest
     needs: precondition
     if: ${{ needs.precondition.outputs.updated != '' }}
     environment: beta
@@ -72,6 +73,10 @@ jobs:
           SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
           RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Compile
         shell: bash
         working-directory: android

.forgejo/workflows/android-release-metadata.yaml

@@ -2,12 +2,13 @@ name: Android Release Metadata
 on:
   workflow_dispatch: # Manual trigger
 
+env:
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+
 jobs:
   android-release-metadata:
     name: Upload Google Play metadata
-    runs-on: codeberg-tiny
-    container:
-      image: runmymind/docker-android-sdk:latest
+    runs-on: ubuntu-latest
     environment: production
     steps:
       - name: Checkout sources

.forgejo/workflows/android-release.yaml

@@ -5,13 +5,12 @@ on:
 env:
   RELEASE_NOTES: android/app/src/google/play/release-notes/en-US/default.txt
   FDROID_VERSION: android/app/src/fdroid/play/version.yaml
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
 
 jobs:
   tag:
     name: Tag
     runs-on: ubuntu-latest
-    container:
-      image: runmymind/docker-android-sdk:latest
     environment: production
     steps:
       - name: Checkout sources
@@ -118,6 +117,10 @@ jobs:
           SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
           RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Set up SDK
         shell: bash
         run: echo "sdk.dir=$ANDROID_SDK_ROOT" > android/local.properties

.forgejo/workflows/appstream-check.yaml

@@ -3,20 +3,20 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - packaging/app.comaps.comaps.metainfo.xml
-      - .forgejo/workflows/appstream-check.yaml # Run check on self change
+      - packaging/app.organicmaps.desktop.metainfo.xml
+      - .forgejo/workflows/appstream-check.yaml  # Run check on self change
 
 jobs:
   validate-appstream:
     name: Validate appstream metadata xml
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           sparse-checkout: |
-            packaging/app.comaps.comaps.metainfo.xml
+            packaging/app.organicmaps.desktop.metainfo.xml
 
       - name: Install appstream validator and flatpak Builder
         shell: bash
@@ -29,8 +29,8 @@ jobs:
 
       - name: Lint appstream data with flatpak Builder
         shell: bash
-        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.comaps.metainfo.xml
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.organicmaps.desktop.metainfo.xml
 
       - name: Run appstreamcli in pedantic mode
         shell: bash
-        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.comaps.metainfo.xml
+        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.organicmaps.desktop.metainfo.xml

.forgejo/workflows/coverage-check.yaml

@@ -33,7 +33,7 @@ concurrency:
 jobs:
   should-run-check:
     name: Should run coverage
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-24.04
     outputs:
       run-from-pr: ${{ steps.run-from-pr.outputs.run-from-pr }}
       manually-triggered: ${{ steps.manually-triggered.outputs.manually-triggered }}
@@ -59,9 +59,14 @@ jobs:
   coverage:
     needs: should-run-check
     name: Generate coverage report
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: ${{ needs.should-run-check.outputs.run-from-pr == 'true' || needs.should-run-check.outputs.manually-triggered == 'true'}}
     steps:
+      - name: Free disk space by removing .NET, Android and Haskell
+        shell: bash
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
@@ -89,6 +94,10 @@ jobs:
               llvm \
               gcovr
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.forgejo/workflows/desktop-file-check.yaml

@@ -3,20 +3,20 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - qt/res/app.comaps.comaps.desktop
-      - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
+      - qt/res/app.organicmaps.desktop.desktop
+      - .forgejo/workflows/desktop-file-check.yaml  # Run check on self change
 
 jobs:
   validate-desktop-file:
     name: Validate .desktop file
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           sparse-checkout: |
-            qt/res/app.comaps.comaps.desktop
+            qt/res/app.organicmaps.desktop.desktop
 
       - name: Install desktop-file-validate tool
         shell: bash
@@ -27,4 +27,4 @@ jobs:
 
       - name: Validate desktop file
         shell: bash
-        run: desktop-file-validate qt/res/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/app.organicmaps.desktop.desktop && echo "Successfully validated .desktop file"

.forgejo/workflows/ios-check-metadata.yaml

@@ -10,7 +10,7 @@ on:
 jobs:
   ios-check-metadata:
     name: Check app metadata
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.forgejo/workflows/ios-check.yaml

@@ -103,4 +103,4 @@ jobs:
             -destination 'generic/platform=iOS' \
             -quiet \
             CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGNING_ALLOWED=NO
+            CODE_SIGNING_ALLOWED=NO

.forgejo/workflows/linux-check.yaml

@@ -31,13 +31,18 @@ on:
 jobs:
   linux-no-unity:
     name: Linux no unity build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     # Cancels previous jobs if the same branch or PR was updated again.
     concurrency:
       group: ${{ github.workflow }}-no-unity-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
 
     steps:
+      - name: Free disk space by removing .NET, Android and Haskell
+        shell: bash
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
@@ -66,6 +71,10 @@ jobs:
               libqt6positioning6-plugins \
               libqt6positioning6
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
@@ -90,7 +99,7 @@ jobs:
 
   linux-matrix:
     name: Linux builds and tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -102,6 +111,11 @@ jobs:
       cancel-in-progress: true
 
     steps:
+      - name: Free disk space by removing .NET, Android and Haskell
+        shell: bash
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+
       - name: Checkout sources
         uses: actions/checkout@v4
 
@@ -128,6 +142,10 @@ jobs:
               libqt6positioning6-plugins \
               libqt6positioning6
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.forgejo/workflows/macos-check.yaml

@@ -57,6 +57,10 @@ jobs:
         run: |
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ninja qt@6
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.github/workflows/android-check.yaml

@@ -7,7 +7,6 @@ on:
 
 env:
   JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-  SKIP_MAP_DOWNLOAD: true
 
 jobs:
   lint:
@@ -23,6 +22,10 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
+      - name:  Init boost, generate textures
+        shell: bash
+        run: ./configure.sh --skip-map-download
+
       - name: Lint
         shell: bash
         working-directory: android
@@ -73,6 +76,10 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
+      - name:  Init boost, generate textures
+        shell: bash
+        run: ./configure.sh --skip-map-download
+
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.github/workflows/clang-format.yaml

@@ -1,43 +0,0 @@
-name: clang-format
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'android/app/src/**.java'
-      - '.clang-format'
-      - '.github/workflows/clang-format.yml'
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'android/app/src/**.java'
-      - '.clang-format'
-      - '.github/workflows/clang-format.yml'
-
-jobs:
-  check-formatting:
-    runs-on: ubuntu-latest
-    continue-on-error: true  # TODO(AB): Remove this line when ready to enforce formatting.
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install clang-format
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y clang-format-19
-          clang-format-19 --version
-
-      - name: Check Java formatting
-        run: |
-          JAVA_FILES=($(find android/app/src -name '*.java'))
-
-          FORMATTING_ISSUES=$(clang-format-19 --dry-run --Werror $JAVA_FILES 2>&1 || true)
-
-          if [ -n "$FORMATTING_ISSUES" ]; then
-            echo "$FORMATTING_ISSUES"
-            echo ""
-            echo "To fix formatting, please run:"
-            echo "  clang-format -i <file>"
-            exit 1
-          fi

.github/workflows/ios-check.yaml

@@ -37,7 +37,7 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
 
-      - name:  Configure repository
+      - name:  Init boost, download World map, generate textures
         shell: bash
         run: ./configure.sh
 

.gitignore

@@ -14,24 +14,22 @@ stxxl.errlog
 stxxl.log
 screenlog.0
 
-data/symbols/*/design/
+data/styles/*/*/out/*
+data/resources-*_design/*
 # symbols png/sdf are now generated at build
-data/symbols/**/symbols.png
-data/symbols/**/symbols.sdf
+data/resources-*_*/symbols.png
+data/resources-*_*/symbols.sdf
+data/drules_proto_default_design.bin
 data/colors_design.txt
 data/patterns_design.txt
 data/bookmarks
 data/edits.xml
 data/World.mwm
 data/WorldCoasts.mwm
-data/world_mwm/*
-data/*_hash
-data/drules_proto*
-data/classificator.txt
-data/types.txt
-data/visibility.txt
-data/colors.txt
-data/patterns.txt
+
+# generated when running tests. NOT the lowercase 'testing' which should be kept.
+Testing
+!testing
 
 # Compiled Python
 *.pyc
@@ -52,7 +50,8 @@ omim.sdf
 *.rc
 !qt/res/windows.rc
 *.pdb
-out/
+out/*
+qt/mapswithme.log
 
 # XCode
 xcode/keys/*

CMakeLists.txt

@@ -48,8 +48,6 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
   set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()
 
-execute_process(COMMAND "./configure.sh" WORKING_DIRECTORY ${OMIM_ROOT})
-
 message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
 if (CMAKE_UNITY_BUILD)
@@ -271,5 +269,5 @@ endif()
 omim_add_test_subdirectory(qt_tstfrm)
 
 if (PLATFORM_ANDROID)
-  add_subdirectory(android/sdk/src/main/cpp)
+  add_subdirectory(android/app/src/main/cpp)
 endif()

INSTALL.md

@@ -1 +1 @@
-See [docs/INSTALL.md](docs/INSTALL.md) 
+See [docs/INSTALL.md](docs/INSTALL.md)

README.md

@@ -53,9 +53,6 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
   <a href="https://f-droid.org/en/packages/app.comaps.fdroid/">
     <img src="docs/badges/fdroid.png" alt="F-Droid" width="160"/>
   </a>
-  <a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/comaps/comaps">
-    <img src="docs/badges/obtainium.png" alt="Obtainium" width="160"/>
-  </a>
   <a href="https://codeberg.org/comaps/comaps/releases">
     <img src="docs/badges/codeberg.png" alt="Codeberg" width="160"/>
   </a>
@@ -125,8 +122,10 @@ You can help by donating, contributing code, translating, or by telling others a
 
 - Build instructions: [docs/INSTALL.md](docs/INSTALL.md)  
 - Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
+> [!NOTE]  
+> Some docs might be outdated, contain broken links or old references to Organic Maps, etc. Its a work in progress and help is much appreciated!
 
-There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md#3-team-messaging) chat for active contributors.
+There is a dedicated Zulip chat for active contributors: [Zulip](https://comaps.zulipchat.com)
 
 ---
 
@@ -161,4 +160,4 @@ MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
 ## ⚖️ License
 
 Licensed under the Apache License 2.0.  
-See [LICENSE](LICENSE), [NOTICE](NOTICE), and [data/copyright.html](data/copyright.html). 
+See [LICENSE](LICENSE), [NOTICE](NOTICE), and [data/copyright.html](data/copyright.html). 

android/Dockerfile

@@ -18,4 +18,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libxi-dev \
   optipng
 WORKDIR /root/comaps
+RUN ./configure.sh
 CMD ./gradlew -Parm64 assembleFdroidDebug

android/app/build.gradle

@@ -15,17 +15,43 @@ buildscript {
   }
 }
 
+repositories {
+  google()
+  mavenCentral()
+  maven { url 'https://www.jitpack.io' } // MPAndroidChart
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish-gradle-plugin'
 
+def run(cmd) {
+  def stdout = new ByteArrayOutputStream()
+  exec {
+    commandLine = cmd
+    standardOutput = stdout
+  }
+  return stdout.toString()
+}
+
 
 import com.github.triplet.gradle.androidpublisher.ReleaseStatus
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
+def getVersion() {
+  def isWindows = DefaultNativePlatform.getCurrentOperatingSystem().isWindows()
+  def bash = isWindows ? 'C:\\Program Files\\Git\\bin\\bash.exe' : 'bash'
+  def versionCode = Integer.parseInt(run([bash, '../../tools/unix/version.sh', 'android_code']).trim())
+  def versionName = run([bash, '../../tools/unix/version.sh', 'android_name']).trim()
+  return new Tuple2(versionCode, versionName)
+}
 
 def getCommitMessage() {
   return run(['git', '--no-pager', 'show', '-s', '--format=%s%n%n%b', 'HEAD']).trim()
 }
 
+def osName = System.properties['os.name'].toLowerCase()
+
 project.ext.appId = 'app.comaps'
 project.ext.appName = 'CoMaps'
 
@@ -37,10 +63,7 @@ project.ext.appName = 'CoMaps'
 //}
 
 android {
-  namespace = 'app.organicmaps'
-
-  // TODO: it should not be here, but in sdk/build.gradle. But for some reason it should be specified here as well.
-  ndkVersion = '28.2.13676358'
+  namespace 'app.organicmaps'
 
   dependenciesInfo {
     // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
@@ -62,23 +85,79 @@ android {
   }
 
   // All properties are read from gradle.properties file
-  compileSdk = propCompileSdkVersion.toInteger()
+  compileSdk propCompileSdkVersion.toInteger()
+
+  ndkVersion '28.2.13676358'
 
   defaultConfig {
-    versionCode = rootProject.ext.versionCode
-    versionName = rootProject.ext.versionName
+    // Default package name is taken from the manifest and should be app.comaps
+    def ver = getVersion()
+    versionCode = ver.V1
+    versionName = ver.V2
     println('Version: ' + versionName)
     println('VersionCode: ' + versionCode)
-    minSdk = propMinSdkVersion.toInteger()
-    targetSdk = propTargetSdkVersion.toInteger()
+    minSdk propMinSdkVersion.toInteger()
+    targetSdk propTargetSdkVersion.toInteger()
     applicationId project.ext.appId
     buildConfigField 'String', 'SUPPORT_MAIL', '"android@comaps.app"'
     // Should be customized in flavors.
     buildConfigField 'String', 'REVIEW_URL', '""'
 
-    base.archivesName = appName.replaceAll('\\s','') + '-' + defaultConfig.versionCode
+    externalNativeBuild {
+      def pchFlag = 'OFF'
+      if (project.hasProperty('pch')) pchFlag = 'ON'
 
-    ndk.debugSymbolLevel = 'full'
+      def njobs = ''
+      if (project.hasProperty('njobs')) njobs = project.getProperty('njobs')
+
+      def enableVulkanDiagnostics = 'OFF'
+      if (project.hasProperty('enableVulkanDiagnostics')) {
+        enableVulkanDiagnostics = project.getProperty('enableVulkanDiagnostics')
+      }
+
+      def enableTrace = 'OFF'
+      if (project.hasProperty('enableTrace')) {
+        enableTrace = project.getProperty('enableTrace')
+      }
+
+      cmake {
+        cppFlags '-fexceptions', '-frtti'
+        // There is no sense to enable sections without gcc's --gc-sections flag.
+        cFlags '-fno-function-sections', '-fno-data-sections',
+               '-Wno-extern-c-compat'
+        arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static',
+                  "-DOS=$osName", '-DSKIP_TESTS=ON', '-DSKIP_TOOLS=ON', "-DUSE_PCH=$pchFlag",
+                  "-DNJOBS=$njobs", "-DENABLE_VULKAN_DIAGNOSTICS=$enableVulkanDiagnostics",
+                  "-DENABLE_TRACE=$enableTrace"
+        targets 'organicmaps'
+      }
+    }
+
+    // Use, for example, -Parm32 gradle parameter to build only for armeabi-v7a.
+    ndk {
+      abiFilters = new HashSet<>()
+      if (project.hasProperty('arm32') || project.hasProperty('armeabi-v7a')) {
+        abiFilters.add('armeabi-v7a')
+      }
+      if (project.hasProperty('arm64') || project.hasProperty('arm64-v8a')) {
+        abiFilters.add('arm64-v8a')
+      }
+      if (project.hasProperty('x86')) {
+        abiFilters.add('x86')
+      }
+      if (project.hasProperty('x86_64') || project.hasProperty('x64')) {
+        abiFilters.add('x86_64')
+      }
+      if (abiFilters.isEmpty()) {
+        abiFilters.add('armeabi-v7a')
+        abiFilters.add('arm64-v8a')
+        // For the emulator, chromebooks and some Intel Atom devices.
+        abiFilters.add('x86_64')
+      }
+      println('Building for ' + abiFilters + ' archs.')
+    }
+
+    setProperty('archivesBaseName', appName.replaceAll('\\s','') + '-' + defaultConfig.versionCode)
   }
 
   flavorDimensions += 'default'
@@ -128,10 +207,10 @@ android {
   splits.abi {
     boolean enabled = project.hasProperty('splitApk')
     println ('Create separate apks: ' + enabled)
-    enable = enabled
+    enable enabled
     reset()
     include 'x86', 'armeabi-v7a', 'arm64-v8a', 'x86_64'
-    universalApk = true
+    universalApk true
   }
 
   lint {
@@ -144,7 +223,7 @@ android {
     disable 'CustomSplashScreen'
     // https://github.com/organicmaps/organicmaps/issues/3610
     disable 'InsecureBaseConfiguration'
-    abortOnError = true
+    abortOnError true
   }
 
   gradle.projectsEvaluated {
@@ -203,29 +282,33 @@ android {
     debug {
       applicationIdSuffix '.debug'   // Allows to install debug and release builds together
       versionNameSuffix '-debug'
+      jniDebuggable true           // Enable jni debug build
       zipAlignEnabled true
-      signingConfig = signingConfigs.debug
+      signingConfig signingConfigs.debug
       resValue 'string', 'app_name', 'CoMaps Debug'
+      // Do not generate separate debug symbols for debug apps, because we don't distribute them.
+      ndk.debugSymbolLevel = 'none'
     }
 
     release {
       if (taskName.contains('release')) {
         if (secureReleasePropertiesFileExists) {
           println('Using RELEASE signing keys from secure.properties.release')
-          signingConfig = signingConfigs.release
+          signingConfig signingConfigs.release
         } else {
           println('NO RELEASE signing keys found')
           println('Using DEBUG signing keys')
-          signingConfig = signingConfigs.debug
+          signingConfig signingConfigs.debug
         }
       }
-
       minifyEnabled true
-      shrinkResources = true
+      shrinkResources true
       // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin.
       // To learn more, go to the documentation section about R8 configuration files.
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       resValue 'string', 'app_name', project.ext.appName
+      // Full size symbols are too big for Google, 217mb aab vs 95mb.
+      ndk.debugSymbolLevel = 'symbol_table'
     }
 
     beta {
@@ -234,27 +317,37 @@ android {
       if (taskName.contains('beta')) {
         if (secureTestPropertiesFileExists) {
           println('Using TEST signing keys from secure.properties.test')
-          signingConfig = signingConfigs.test
+          signingConfig signingConfigs.test
         } else {
           println('NO TEST signing keys found')
           println('Using DEBUG signing keys')
-          signingConfig = signingConfigs.debug
+          signingConfig signingConfigs.debug
         }
       }
       minifyEnabled true
-      shrinkResources = true
+      shrinkResources true
       // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin.
       // To learn more, go to the documentation section about R8 configuration files.
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       matchingFallbacks = ['release'] // use dependencies of "release" build type
       resValue 'string', 'app_name', 'CoMaps Test'
+      // Full size symbols are too big for Google, 217mb aab vs 95mb.
+      ndk.debugSymbolLevel = 'symbol_table'
+    }
+  }
+
+  externalNativeBuild {
+    cmake {
+      version '3.22.1+'
+      buildStagingDirectory './nativeOutputs'
+      path '../../CMakeLists.txt'
     }
   }
 
   // We don't compress these extensions in assets/ because our random FileReader can't read zip-compressed files from apk.
   // TODO: Load all minor files via separate call to ReadAsString which can correctly handle compressed files in zip containers.
   androidResources {
-    ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
+    ignoreAssetsPattern '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
     noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
     localeFilters += [
             "af",
@@ -311,7 +404,7 @@ android {
   }
 
   compileOptions {
-    coreLibraryDesugaringEnabled = true
+    coreLibraryDesugaringEnabled true
 
     sourceCompatibility JavaVersion.VERSION_17
     targetCompatibility JavaVersion.VERSION_17
@@ -319,8 +412,6 @@ android {
 }
 
 dependencies {
-  implementation project(':sdk')
-
   coreLibraryDesugaring libs.android.tools.desugar
 
   // Google Play Location Services
@@ -366,6 +457,10 @@ dependencies {
   testImplementation libs.mockito.core
 }
 
+tasks.withType(JavaCompile) {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}
+
 android.applicationVariants.all { variant ->
   def authorityValue = variant.applicationId + ".provider"
   def authority = "\"" + authorityValue + "\""
@@ -413,7 +508,3 @@ huaweiPublish {
     }
   }
 }
-
-tasks.withType(JavaCompile).configureEach {
-  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
-}

android/app/src/fdroid/play/listings/ca/short-description.txt

@@ -1 +0,0 @@
-Navegació intuïtiva - Descobreix el teu camí - El poder de la comunitat

android/app/src/fdroid/play/listings/es-ES/full-description.txt

@@ -1,65 +0,0 @@
-Una aplicación de mapas gratuita y de código abierto liderada por la comunidad, basada en los datos de OpenStreetMap y reforzada con un compromiso con la transparencia, la privacidad y la ausencia de fines de lucro. CoMaps es un fork o derivado de Organic Maps, que a su vez es un fork de Maps.ME.
-
-<br><br>
-
-Lee más sobre los motivos del proyecto y su dirección en <b><i>codeberg.org/comaps</i></b>.
-
-<br><br>
-
-Únete allí a la comunidad y ayuda a crear la mejor app de mapas
-
-• Usa la aplicación y corre la voz sobre ella
-
-• Envía comentarios y reporta problemas
-
-• Actualiza los datos del mapa en la app o en el sitio web de OpenStreetMap
-
-<br><br>
-
-‣ <b>Enfocada en el uso sin conexión</b>: Planifica y navega tus viajes sin necesidad de conexión móvil, busca puntos de paso en rutas remotas, etc. Todas las funciones están diseñadas para funcionar sin conexión.
-
-‣ <b>Respeta tu Privacidad</b>: La app está diseñada pensando en tu privacidad: no identifica personas, no rastrea y no recoge datos personales. Sin publicidad.
-
-‣ <b>Sencilla y Pulida</b>: funciones esenciales fáciles de usar que simplemente funcionan.
-
-‣ <b>Ahorra Batería y Espacio</b>: No consume la batería como otras apps de navegación. Los mapas compactos ahorran espacio valioso en tu teléfono.
-
-‣ <b>Gratuita y Creada por la Comunidad</b>: Personas como tú ayudaron a construir la app añadiendo lugares a OpenStreetMap, probando funciones, dando opiniones y contribuyendo con desarrollo o financiación.
-
-‣ <b>Toma de decisiones y finanzas abiertas y transparentes, sin ánimo de lucro y completamente de código abierto.</b>
-
-<br><br>
-
-<b>Funciones Principales</b>:
-
-• Mapas detallados descargables con lugares que no aparecen en Google Maps
-
-• Modo exterior con rutas de senderismo destacadas, campings, fuentes de agua, picos, curvas de nivel, etc.
-
-• Caminos peatonales y carriles bici
-
-• Puntos de interés como restaurantes, gasolineras, hoteles, tiendas, lugares turísticos y muchos más
-
-• Búsqueda por nombre, dirección o categoría de punto de interés
-
-• Navegación con indicaciones por voz para caminar, ir en bici o conducir
-
-• Guarda tus lugares favoritos con un solo toque
-
-• Artículos de Wikipedia sin conexión
-
-• Capa de transporte subterráneo y rutas
-
-• Grabación de rutas
-
-• Exporta e importa favoritos y rutas en formatos KML, KMZ y GPX
-
-• Modo oscuro para usar de noche
-
-• Mejora los datos del mapa para todos usando un editor básico integrado
-
-<br><br>
-
-<b>La Libertad Está Aquí</b>
-
-Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -6,4 +6,4 @@
 • se muestra el estado de horarios de apertura al seleccionar un POI
 • se dividen los humedales en tipos distintos
 • se actualiza la vegetación y otros colores del mapa, así como otros iconos
-• exteriores: líneas de contorno de altitud más gruesas
+• exteriores: líneas de contorno de altitud más gruesas

android/app/src/fdroid/play/listings/es-ES/short-description.txt

@@ -1 +0,0 @@
-Navegación de mapa fácil - Descubre más en tu camino - Creado por la comunidad

android/app/src/fdroid/play/listings/es-ES/title.txt

@@ -1 +0,0 @@
-CoMaps - Senderismo, ciclismo y conducción offline

android/app/src/fdroid/play/listings/fr-FR/short-description.txt

@@ -1 +1 @@
-Navigation cartographique facile - Vivez de grands voyages - Propulsé par la communauté
+Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté

android/app/src/fdroid/play/listings/hu-HU/short-description.txt

@@ -1 +0,0 @@
-Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -6,4 +6,4 @@ Apresentamos o logo do CoMaps!
 • Exibição de horário de funcionamento ao selecionar um ponto de interesse
 • Divididas áreas úmidas em vários tipos distintos
 • Atualizada cores/ícones para vegetação e outros elementos
-• Ar livre: curvas de nível de altitude mais destacadas
+• Ar livre: curvas de nível de altitude mais destacadas

android/app/src/fdroid/play/listings/pt-BR/title.txt

@@ -1 +1 @@
-CoMaps - Mapas e Navegação Offline com Privacidade
+CoMaps - Mapas com Privacidade

android/app/src/fdroid/play/listings/pt-PT/short-description.txt

@@ -1 +0,0 @@
-Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos

android/app/src/fdroid/play/listings/pt-PT/title.txt

@@ -1 +0,0 @@
-CoMaps - Mapas e Navegação - Offline e Privada

android/app/src/fdroid/play/release-notes/ar/default.txt

@@ -0,0 +1 @@
+../../listings/ar/release-notes.txt

android/app/src/fdroid/play/release-notes/az-AZ/default.txt

@@ -0,0 +1 @@
+../../listings/az-AZ/release-notes.txt

android/app/src/fdroid/play/release-notes/be/default.txt

@@ -0,0 +1 @@
+../../listings/be/release-notes.txt

android/app/src/fdroid/play/release-notes/bg/default.txt

@@ -0,0 +1 @@
+../../listings/bg/release-notes.txt

android/app/src/fdroid/play/release-notes/bn-BD/default.txt

@@ -0,0 +1 @@
+../../listings/bn-BD/release-notes.txt

android/app/src/fdroid/play/release-notes/ca/default.txt

@@ -0,0 +1 @@
+../../listings/ca/release-notes.txt

android/app/src/fdroid/play/release-notes/cs-CZ/default.txt

@@ -0,0 +1 @@
+../../listings/cs-CZ/release-notes.txt

android/app/src/fdroid/play/release-notes/da-DK/default.txt

@@ -0,0 +1 @@
+../../listings/da-DK/release-notes.txt

android/app/src/fdroid/play/release-notes/el-GR/default.txt

@@ -0,0 +1 @@
+../../listings/el-GR/release-notes.txt

android/app/src/fdroid/play/release-notes/et/default.txt

@@ -0,0 +1 @@
+../../listings/et/release-notes.txt

android/app/src/fdroid/play/release-notes/eu-ES/default.txt

@@ -0,0 +1 @@
+../../listings/eu-ES/release-notes.txt

android/app/src/fdroid/play/release-notes/fa/default.txt

@@ -0,0 +1 @@
+../../listings/fa/release-notes.txt

android/app/src/fdroid/play/release-notes/fi-FI/default.txt

@@ -0,0 +1 @@
+../../listings/fi-FI/release-notes.txt

android/app/src/fdroid/play/release-notes/gl-ES/default.txt

@@ -0,0 +1 @@
+../../listings/gl-ES/release-notes.txt

android/app/src/fdroid/play/release-notes/gu/default.txt

@@ -0,0 +1 @@
+../../listings/gu/release-notes.txt

android/app/src/fdroid/play/release-notes/hi-IN/default.txt

@@ -0,0 +1 @@
+../../listings/hi-IN/release-notes.txt

android/app/src/fdroid/play/release-notes/hr/default.txt

@@ -0,0 +1 @@
+../../listings/hr/release-notes.txt

android/app/src/fdroid/play/release-notes/hu-HU/default.txt

@@ -0,0 +1 @@
+../../listings/hu-HU/release-notes.txt

android/app/src/fdroid/play/release-notes/id/default.txt

@@ -0,0 +1 @@
+../../listings/id/release-notes.txt

android/app/src/fdroid/play/release-notes/it-IT/default.txt

@@ -0,0 +1 @@
+../../listings/it-IT/release-notes.txt

android/app/src/fdroid/play/release-notes/iw-IL/default.txt

@@ -0,0 +1 @@
+../../listings/iw-IL/release-notes.txt

android/app/src/fdroid/play/release-notes/ja-JP/default.txt

@@ -0,0 +1 @@
+../../listings/ja-JP/release-notes.txt

android/app/src/fdroid/play/release-notes/ka-GE/default.txt

@@ -0,0 +1 @@
+../../listings/ka-GE/release-notes.txt

android/app/src/fdroid/play/release-notes/kk/default.txt

@@ -0,0 +1 @@
+../../listings/kk/release-notes.txt

android/app/src/fdroid/play/release-notes/km-KH/default.txt

@@ -0,0 +1 @@
+../../listings/km-KH/release-notes.txt

android/app/src/fdroid/play/release-notes/kn-IN/default.txt

@@ -0,0 +1 @@
+../../listings/kn-IN/release-notes.txt

android/app/src/fdroid/play/release-notes/ko-KR/default.txt

@@ -0,0 +1 @@
+../../listings/ko-KR/release-notes.txt

android/app/src/fdroid/play/release-notes/lo-LA/default.txt

@@ -0,0 +1 @@
+../../listings/lo-LA/release-notes.txt

android/app/src/fdroid/play/release-notes/lt/default.txt

@@ -0,0 +1 @@
+../../listings/lt/release-notes.txt

android/app/src/fdroid/play/release-notes/lv/default.txt

@@ -0,0 +1 @@
+../../listings/lv/release-notes.txt

android/app/src/fdroid/play/release-notes/mk-MK/default.txt

@@ -0,0 +1 @@
+../../listings/mk-MK/release-notes.txt

android/app/src/fdroid/play/release-notes/ml-IN/default.txt

@@ -0,0 +1 @@
+../../listings/ml-IN/release-notes.txt

android/app/src/fdroid/play/release-notes/mr-IN/default.txt

@@ -0,0 +1 @@
+../../listings/mr-IN/release-notes.txt

android/app/src/fdroid/play/release-notes/ms/default.txt

@@ -0,0 +1 @@
+../../listings/ms/release-notes.txt

android/app/src/fdroid/play/release-notes/ne-NP/default.txt

@@ -0,0 +1 @@
+../../listings/ne-NP/release-notes.txt

android/app/src/fdroid/play/release-notes/nl-NL/default.txt

@@ -0,0 +1 @@
+../../listings/nl-NL/release-notes.txt

android/app/src/fdroid/play/release-notes/no-NO/default.txt

@@ -0,0 +1 @@
+../../listings/no-NO/release-notes.txt

android/app/src/fdroid/play/release-notes/pl-PL/default.txt

@@ -0,0 +1 @@
+../../listings/pl-PL/release-notes.txt

android/app/src/fdroid/play/release-notes/pt-BR/default.txt

@@ -0,0 +1 @@
+../../listings/pt-BR/release-notes.txt

android/app/src/fdroid/play/release-notes/pt-PT/default.txt

@@ -0,0 +1 @@
+../../listings/pt-PT/release-notes.txt

android/app/src/fdroid/play/release-notes/ro/default.txt

@@ -0,0 +1 @@
+../../listings/ro/release-notes.txt

android/app/src/fdroid/play/release-notes/si-LK/default.txt

@@ -0,0 +1 @@
+../../listings/si-LK/release-notes.txt

android/app/src/fdroid/play/release-notes/sk/default.txt

@@ -0,0 +1 @@
+../../listings/sk/release-notes.txt

android/app/src/fdroid/play/release-notes/sl/default.txt

@@ -0,0 +1 @@
+../../listings/sl/release-notes.txt