From f796f57996b1f429360e1514274723cefa58d562 Mon Sep 17 00:00:00 2001 From: jkoan Date: Wed, 4 Mar 2020 19:13:21 +0100 Subject: add:build:Android build and signing. Also add fastlane for metadata. Set execute on scripts/*.sh --- .circleci/config.yml | 14 +++--- fastlane/Appfile | 4 ++ fastlane/Fastfile | 50 +++++++++++++++++++++ .../metadata/android/de-DE/full_description.txt | 10 +++++ .../metadata/android/de-DE/short_description.txt | 1 + fastlane/metadata/android/de-DE/title.txt | 1 + fastlane/metadata/android/de-DE/video.txt | 0 .../en-US/changelogs/navit 0.5.1-1804161521.txt | 1 + .../metadata/android/en-US/full_description.txt | 11 +++++ .../android/en-US/images/featureGraphic.png | Bin 0 -> 84495 bytes fastlane/metadata/android/en-US/images/icon.png | Bin 0 -> 77968 bytes .../en-US/images/phoneScreenshots/1_en-US.jpeg | Bin 0 -> 65539 bytes .../en-US/images/phoneScreenshots/2_en-US.jpeg | Bin 0 -> 56338 bytes .../en-US/images/phoneScreenshots/3_en-US.jpeg | Bin 0 -> 58126 bytes .../en-US/images/phoneScreenshots/4_en-US.jpeg | Bin 0 -> 46951 bytes .../en-US/images/phoneScreenshots/5_en-US.jpeg | Bin 0 -> 52029 bytes .../android/en-US/images/promoGraphic.jpeg | Bin 0 -> 5360 bytes .../en-US/images/sevenInchScreenshots/1_en-US.png | Bin 0 -> 2755223 bytes .../metadata/android/en-US/short_description.txt | 1 + fastlane/metadata/android/en-US/title.txt | 1 + fastlane/metadata/android/en-US/video.txt | 0 .../metadata/android/fr-FR/full_description.txt | 11 +++++ .../metadata/android/fr-FR/short_description.txt | 1 + fastlane/metadata/android/fr-FR/title.txt | 1 + fastlane/metadata/android/fr-FR/video.txt | 0 .../metadata/android/nl-NL/full_description.txt | 11 +++++ .../metadata/android/nl-NL/short_description.txt | 1 + fastlane/metadata/android/nl-NL/title.txt | 1 + fastlane/metadata/android/nl-NL/video.txt | 0 .../metadata/android/pl-PL/full_description.txt | 11 +++++ .../metadata/android/pl-PL/short_description.txt | 1 + fastlane/metadata/android/pl-PL/title.txt | 1 + fastlane/metadata/android/pl-PL/video.txt | 0 .../metadata/android/ru-RU/full_description.txt | 14 ++++++ .../metadata/android/ru-RU/short_description.txt | 1 + fastlane/metadata/android/ru-RU/title.txt | 1 + fastlane/metadata/android/ru-RU/video.txt | 0 navit/android/build.gradle | 10 +++++ scripts/build.sh | 0 scripts/build_linux.sh | 0 scripts/build_tomtom_minimal.sh | 0 scripts/build_tomtom_plugin.sh | 0 scripts/build_win32.sh | 0 scripts/build_wince.sh | 0 scripts/generate_contributors.sh | 0 scripts/import_translation.sh | 0 scripts/merge_i18n_update.sh | 0 scripts/publish.sh | 0 scripts/run_linux_tests.sh | 0 scripts/setup_android.sh | 44 ++---------------- scripts/setup_common_requirements.sh | 0 scripts/setup_publish_keys.sh | 11 +++++ scripts/setup_sanitycheck_requirements.sh | 0 scripts/setup_tomtom_requirements.sh | 0 scripts/setup_wince.sh | 0 scripts/update_download_center.sh | 0 scripts/update_doxygen.sh | 0 scripts/xdotools.sh | 0 58 files changed, 167 insertions(+), 47 deletions(-) create mode 100644 fastlane/Appfile create mode 100644 fastlane/Fastfile create mode 100644 fastlane/metadata/android/de-DE/full_description.txt create mode 100644 fastlane/metadata/android/de-DE/short_description.txt create mode 100644 fastlane/metadata/android/de-DE/title.txt create mode 100644 fastlane/metadata/android/de-DE/video.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/navit 0.5.1-1804161521.txt create mode 100644 fastlane/metadata/android/en-US/full_description.txt create mode 100644 fastlane/metadata/android/en-US/images/featureGraphic.png create mode 100644 fastlane/metadata/android/en-US/images/icon.png create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.jpeg create mode 100644 fastlane/metadata/android/en-US/images/promoGraphic.jpeg create mode 100644 fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png create mode 100644 fastlane/metadata/android/en-US/short_description.txt create mode 100644 fastlane/metadata/android/en-US/title.txt create mode 100644 fastlane/metadata/android/en-US/video.txt create mode 100644 fastlane/metadata/android/fr-FR/full_description.txt create mode 100644 fastlane/metadata/android/fr-FR/short_description.txt create mode 100644 fastlane/metadata/android/fr-FR/title.txt create mode 100644 fastlane/metadata/android/fr-FR/video.txt create mode 100644 fastlane/metadata/android/nl-NL/full_description.txt create mode 100644 fastlane/metadata/android/nl-NL/short_description.txt create mode 100644 fastlane/metadata/android/nl-NL/title.txt create mode 100644 fastlane/metadata/android/nl-NL/video.txt create mode 100644 fastlane/metadata/android/pl-PL/full_description.txt create mode 100644 fastlane/metadata/android/pl-PL/short_description.txt create mode 100644 fastlane/metadata/android/pl-PL/title.txt create mode 100644 fastlane/metadata/android/pl-PL/video.txt create mode 100644 fastlane/metadata/android/ru-RU/full_description.txt create mode 100644 fastlane/metadata/android/ru-RU/short_description.txt create mode 100644 fastlane/metadata/android/ru-RU/title.txt create mode 100644 fastlane/metadata/android/ru-RU/video.txt mode change 100644 => 100755 scripts/build.sh mode change 100644 => 100755 scripts/build_linux.sh mode change 100644 => 100755 scripts/build_tomtom_minimal.sh mode change 100644 => 100755 scripts/build_tomtom_plugin.sh mode change 100644 => 100755 scripts/build_win32.sh mode change 100644 => 100755 scripts/build_wince.sh mode change 100644 => 100755 scripts/generate_contributors.sh mode change 100644 => 100755 scripts/import_translation.sh mode change 100644 => 100755 scripts/merge_i18n_update.sh mode change 100644 => 100755 scripts/publish.sh mode change 100644 => 100755 scripts/run_linux_tests.sh mode change 100644 => 100755 scripts/setup_android.sh mode change 100644 => 100755 scripts/setup_common_requirements.sh create mode 100755 scripts/setup_publish_keys.sh mode change 100644 => 100755 scripts/setup_sanitycheck_requirements.sh mode change 100644 => 100755 scripts/setup_tomtom_requirements.sh mode change 100644 => 100755 scripts/setup_wince.sh mode change 100644 => 100755 scripts/update_download_center.sh mode change 100644 => 100755 scripts/update_doxygen.sh mode change 100644 => 100755 scripts/xdotools.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b7263a34..caa695e1b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,17 +82,19 @@ jobs: environment: JVM_OPTS: -Xmx3200m GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' + KEYSTORE: '/home/circleci/.keystore' steps: - checkout - run: if scripts/check_need_build.sh; then circleci step halt; fi - run: - name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config rename - command: | - sudo apt-get update - sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config rename + name: Install requirements + command: scripts/setup_android.sh + - run: + name: Setup Keystore and Playstore Keys + command: scripts/setup_publish_keys.sh - run: - name: Build for Android - command: bash scripts/build_android.sh + name: Build and upload Android + command: fastlane circleci - run: name: Run Lint Test command: | diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 000000000..d00d0326c --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,4 @@ +# For more information about the Appfile, see: +# https://docs.fastlane.tools/advanced/#appfile + +app_identifier("org.navitproject.navit") diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 000000000..083d65059 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,50 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# +default_platform(:android) + +require 'git' + +def currentBranch() + branch = git_branch() + if !branch.to_s.empty? + return branch + end + git = Git.open(File.join(File.dirname(__FILE__), '../')) # git_branch() does not seem work on Windows, it will print error with path not found. + return git.current_branch +end + + +platform :android do + desc "Description of what the lane does" + lane :circleci do + # Here we can add other things that circleci should do + playstore + end + lane :playstore do + sh("cd ..;bash scripts/build_android.sh") + + gradle( + task: 'assemble', + build_type: 'Release' + ) + isOnMasterBranch = currentBranch() == "master" + if !isOnMasterBranch + upload_to_play_store( track: 'beta', + json_key: 'key.json', + apk: 'navit/android/build/outputs/apk/release/android-release.apk', + package_name: 'org.navitproject.navit' + ) + else + puts "Not on master, no upload to google play" + end + end +end diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt new file mode 100644 index 000000000..3c3efd6a3 --- /dev/null +++ b/fastlane/metadata/android/de-DE/full_description.txt @@ -0,0 +1,10 @@ +Navit für Android ist eine open source (GPL) Navigationsanwendung. +Zum offline navigieren für Auto, Fahrrad oder zu Fuss. + +Navit zeichnet die Karte mit Vektorgrafik und kommt ohne Internetverbindung aus. + +Features: +*) Aus google maps mit Navit zum Ziel navigieren +*) komplett offline ohne Internetverbindung +*) Sprachansage in verschiedenen Sprachen +*) aktuelles OSM Kartenmaterial \ No newline at end of file diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt new file mode 100644 index 000000000..f5b38ca77 --- /dev/null +++ b/fastlane/metadata/android/de-DE/short_description.txt @@ -0,0 +1 @@ +Navit für Android, komplett gratis und offline für Androidgeräte \ No newline at end of file diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt new file mode 100644 index 000000000..4bf7ab6c8 --- /dev/null +++ b/fastlane/metadata/android/de-DE/title.txt @@ -0,0 +1 @@ +Navit für Android \ No newline at end of file diff --git a/fastlane/metadata/android/de-DE/video.txt b/fastlane/metadata/android/de-DE/video.txt new file mode 100644 index 000000000..e69de29bb diff --git a/fastlane/metadata/android/en-US/changelogs/navit 0.5.1-1804161521.txt b/fastlane/metadata/android/en-US/changelogs/navit 0.5.1-1804161521.txt new file mode 100644 index 000000000..4f3d19e29 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/navit 0.5.1-1804161521.txt @@ -0,0 +1 @@ +This release disables the bug report until we improve our privacy policy. \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt new file mode 100644 index 000000000..c1707e0f2 --- /dev/null +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -0,0 +1,11 @@ +Navit for Android is an open source (GPL) car navigation system. +It will display your position on a map (in bird-view mode or as a 3D "visualization") from GPS sensor data, and can provide precise route calculation, touch screen functionality and supports Points of Interest (POI). + +Unlike other navigation systems, Navit maps are dynamically generated in real time from vector data. +Navit is completly offline and works without an internet connection. Navit respects your privacy and does not track your position. + +Features: +*) Navigate to target from google maps +*) works offline +*) spoken directions in many languages +*) uptodate OSM maps \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png new file mode 100644 index 000000000..5c766c722 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png new file mode 100644 index 000000000..b25e9f8d6 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg new file mode 100644 index 000000000..6792d911b Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg new file mode 100644 index 000000000..72a609cd2 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg new file mode 100644 index 000000000..91e3890fa Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg new file mode 100644 index 000000000..b27c020bc Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.jpeg new file mode 100644 index 000000000..d2ea0637c Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.jpeg differ diff --git a/fastlane/metadata/android/en-US/images/promoGraphic.jpeg b/fastlane/metadata/android/en-US/images/promoGraphic.jpeg new file mode 100644 index 000000000..042fcbbe8 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/promoGraphic.jpeg differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png new file mode 100644 index 000000000..9eb7bda89 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt new file mode 100644 index 000000000..01629f09c --- /dev/null +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -0,0 +1 @@ +Navit for Android, the completely free and offline Navigation system for Android \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt new file mode 100644 index 000000000..1da1b8a05 --- /dev/null +++ b/fastlane/metadata/android/en-US/title.txt @@ -0,0 +1 @@ +Navit for Android \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt new file mode 100644 index 000000000..e69de29bb diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt new file mode 100644 index 000000000..ffd5b1f40 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/full_description.txt @@ -0,0 +1,11 @@ +Navit pour Android est une système de navigation open source (GPL). +Navit montre votre position sur une carte (en vue aérienne ou en 3D) en utilisant le GPS, l'application calcule la meilleure route vers votre destination et vous permet d'utiliser des Points d'intérêt (POI). + +Contrairement à des autres systèmes de navigation, Navit génère ses cartes dynamiquement à partir de données vectorielles. +Navit fonctionne parfaitement en mode déconnecté. Navit respecte votre vie privée et ne traque pas vos déplacements. + +Fonctionnalités: +*) Naviguez vers un point depuis google maps +*) Fonctionne en mode déconnecté +*) Instructions vocales +*) Des cartes récentes et libre de OpenStreetMaps \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt new file mode 100644 index 000000000..68c88d343 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/short_description.txt @@ -0,0 +1 @@ +Navit pour Android, le système de navigation complètement libre et offline \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt new file mode 100644 index 000000000..133c80480 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/title.txt @@ -0,0 +1 @@ +Navit pour Android \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/video.txt b/fastlane/metadata/android/fr-FR/video.txt new file mode 100644 index 000000000..e69de29bb diff --git a/fastlane/metadata/android/nl-NL/full_description.txt b/fastlane/metadata/android/nl-NL/full_description.txt new file mode 100644 index 000000000..992b3b550 --- /dev/null +++ b/fastlane/metadata/android/nl-NL/full_description.txt @@ -0,0 +1,11 @@ +Navit is een opensource (GPL) navigatiesysteem voor gebruik in de auto, +op de fiets, te voet .... + +In tegenstelling tot andere navigatiesystemen maakt Navit dynamisch zijn kaarten aan van offline vector data. +Bijgevolg kan Navit volledig offline functioneren. + +Features +*) Zoek een punt op google maps en navigeer er naar met Navit. +*) werkt offline +*) gesproken instructies, inclusief Nederlands +*) gratis OSM kaarten en regelmatige updates via de mapserver \ No newline at end of file diff --git a/fastlane/metadata/android/nl-NL/short_description.txt b/fastlane/metadata/android/nl-NL/short_description.txt new file mode 100644 index 000000000..b91ee980c --- /dev/null +++ b/fastlane/metadata/android/nl-NL/short_description.txt @@ -0,0 +1 @@ +Novit, het gratis en offline navitgatiesysteem voor Android \ No newline at end of file diff --git a/fastlane/metadata/android/nl-NL/title.txt b/fastlane/metadata/android/nl-NL/title.txt new file mode 100644 index 000000000..4b52d46c1 --- /dev/null +++ b/fastlane/metadata/android/nl-NL/title.txt @@ -0,0 +1 @@ +Navit voor Android \ No newline at end of file diff --git a/fastlane/metadata/android/nl-NL/video.txt b/fastlane/metadata/android/nl-NL/video.txt new file mode 100644 index 000000000..e69de29bb diff --git a/fastlane/metadata/android/pl-PL/full_description.txt b/fastlane/metadata/android/pl-PL/full_description.txt new file mode 100644 index 000000000..c1eab69e0 --- /dev/null +++ b/fastlane/metadata/android/pl-PL/full_description.txt @@ -0,0 +1,11 @@ +Navit dla Android jest darmowym wolno źródłowym (GPL) systemem nawigacji samochodowej. +Pokazuje Twoją pozycje na mapie (w trybie "z lotu ptaka" lub w 3D) na podstawie danych z odbiornika GPS, zawiera wbudowany dokładny algorytm wytyczający trasę, obsługę ekranów dotykowych, komendy głosowe oraz wyświetlanie "Użytecznych Miejsc" (POI). + +W przeciwieństwie do innych systemów nawigacji, mapy w Navit są na żywo generowane z danych wektorowych. +Połączenie z internetem nie jest wymagane do pracy z Navit. + +Cechy: +*) Nawigowanie do celu z Google Maps™ +*) praca bez połączenia z internetem +*) komendy głosowe w wielu językach (ponad 20) +*) aktualne mapy OpenStreetMaps \ No newline at end of file diff --git a/fastlane/metadata/android/pl-PL/short_description.txt b/fastlane/metadata/android/pl-PL/short_description.txt new file mode 100644 index 000000000..043324ca3 --- /dev/null +++ b/fastlane/metadata/android/pl-PL/short_description.txt @@ -0,0 +1 @@ +Navit dla Android, całkowicie darmowa Nawigacja dla Android! \ No newline at end of file diff --git a/fastlane/metadata/android/pl-PL/title.txt b/fastlane/metadata/android/pl-PL/title.txt new file mode 100644 index 000000000..1c02dc8f8 --- /dev/null +++ b/fastlane/metadata/android/pl-PL/title.txt @@ -0,0 +1 @@ +Navit dla Android \ No newline at end of file diff --git a/fastlane/metadata/android/pl-PL/video.txt b/fastlane/metadata/android/pl-PL/video.txt new file mode 100644 index 000000000..e69de29bb diff --git a/fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt new file mode 100644 index 000000000..d48156665 --- /dev/null +++ b/fastlane/metadata/android/ru-RU/full_description.txt @@ -0,0 +1,14 @@ +Navit для Android это система автомобильной навигации с открытым исходным кодом (GPL), способная показать ваше положение на карте (в режиме плоского или трёхмерного просмотра) используя данные с GPS-приёмника, найти точный маршрут и близлежащие точки интереса (POI). + +Поддерживаются все функции сенсорного экрана. + +В отличие от других навигационных систем, карты Navit создаются динамически в реальном +времени из векторных данных. + +Navit работает полностью автономно и без подключения к интернету. + +Особенности: +*) позволяет перейти в точку назначения из Google Maps +*) не требует доступа в интернет +*) проговаривает направления (голосовые подсказки) на многих языках +*) использует самые последние OSM карты \ No newline at end of file diff --git a/fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt new file mode 100644 index 000000000..f662bffd1 --- /dev/null +++ b/fastlane/metadata/android/ru-RU/short_description.txt @@ -0,0 +1 @@ +Navit для Android - свободная навигационная система \ No newline at end of file diff --git a/fastlane/metadata/android/ru-RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt new file mode 100644 index 000000000..d4d4b8e40 --- /dev/null +++ b/fastlane/metadata/android/ru-RU/title.txt @@ -0,0 +1 @@ +Navit для Android \ No newline at end of file diff --git a/fastlane/metadata/android/ru-RU/video.txt b/fastlane/metadata/android/ru-RU/video.txt new file mode 100644 index 000000000..e69de29bb diff --git a/navit/android/build.gradle b/navit/android/build.gradle index 711f77def..47c304ab9 100644 --- a/navit/android/build.gradle +++ b/navit/android/build.gradle @@ -5,6 +5,15 @@ apply plugin: 'checkstyle' android { compileSdkVersion 29 buildToolsVersion "29.0.2" + signingConfigs { + release { + // We can leave these in environment variables + storeFile file(System.getenv("KEYSTORE")) + keyAlias System.getenv("KEY_ALIAS") + storePassword System.getenv("STORE_PASS") + keyPassword System.getenv("KEY_PASS") + } + } defaultConfig { applicationId "org.navitproject.navit" minSdkVersion 10 @@ -25,6 +34,7 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } lintOptions { diff --git a/scripts/build.sh b/scripts/build.sh old mode 100644 new mode 100755 diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh old mode 100644 new mode 100755 diff --git a/scripts/build_tomtom_minimal.sh b/scripts/build_tomtom_minimal.sh old mode 100644 new mode 100755 diff --git a/scripts/build_tomtom_plugin.sh b/scripts/build_tomtom_plugin.sh old mode 100644 new mode 100755 diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh old mode 100644 new mode 100755 diff --git a/scripts/build_wince.sh b/scripts/build_wince.sh old mode 100644 new mode 100755 diff --git a/scripts/generate_contributors.sh b/scripts/generate_contributors.sh old mode 100644 new mode 100755 diff --git a/scripts/import_translation.sh b/scripts/import_translation.sh old mode 100644 new mode 100755 diff --git a/scripts/merge_i18n_update.sh b/scripts/merge_i18n_update.sh old mode 100644 new mode 100755 diff --git a/scripts/publish.sh b/scripts/publish.sh old mode 100644 new mode 100755 diff --git a/scripts/run_linux_tests.sh b/scripts/run_linux_tests.sh old mode 100644 new mode 100755 diff --git a/scripts/setup_android.sh b/scripts/setup_android.sh old mode 100644 new mode 100755 index fee29613b..357cdc990 --- a/scripts/setup_android.sh +++ b/scripts/setup_android.sh @@ -1,45 +1,7 @@ #!/bin/bash set -e -apt-get update && apt-get install -y software-properties-common -add-apt-repository -y ppa:openjdk-r/ppa -apt-get update && apt-get install -y openjdk-8-jdk wget expect curl libsaxonb-java ant ca-certificates python-pip -apt-get remove -y openjdk-7-jre-headless - -export ANDROID_SDK_HOME=/opt/android-sdk-linux -export ANDROID_HOME=/opt/android-sdk-linux - -cd /opt && wget -q https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -O android-sdk.tgz -cd /opt && tar -xvzf android-sdk.tgz --no-same-owner -cd /opt && rm -f android-sdk.tgz - -export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools - -echo y | android update sdk --no-ui --all --filter platform-tools | grep 'package installed' - -# This is only an workaround to make sure the platform tools are installed -if [ ! -d ${ANDROID_SDK_HOME}/platform-tools ] && [ -f ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip ]; then - if [ "$(md5sum ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip | cut -d" " -f1)" == "ef952bb31497f7535e061ad0e712bed8" ]; then - cd ${ANDROID_SDK_HOME} && unzip ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip - fi -fi - -#RUN echo y | android update sdk --no-ui --all --filter extra-android-support | grep 'package installed' - -echo y | android update sdk --no-ui --all --filter android-25 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter android-24 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter android-23 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter android-18 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter android-16 | grep 'package installed' - -echo y | android update sdk --no-ui --all --filter build-tools-25.0.3 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-25.0.2 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-25.0.1 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-25.0.0 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-24.0.3 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-24.0.2 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-24.0.1 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-23.0.3 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-23.0.2 | grep 'package installed' -echo y | android update sdk --no-ui --all --filter build-tools-23.0.1 | grep 'package installed' +sudo apt-get update +sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config rename +gem install --no-document fastlane git diff --git a/scripts/setup_common_requirements.sh b/scripts/setup_common_requirements.sh old mode 100644 new mode 100755 diff --git a/scripts/setup_publish_keys.sh b/scripts/setup_publish_keys.sh new file mode 100755 index 000000000..7c5968423 --- /dev/null +++ b/scripts/setup_publish_keys.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +echo $GOOGLE_KEY | base64 -d > key.json + +wget "https://github.com/navit-gps/infrastructure-blackbox/raw/master/keyrings/keystore.gpg" +openssl aes-256-cbc -d -in keystore.gpg -md md5 -k $KEY > ~/.keystore +keytool -importkeystore -srcstorepass "$STORE_PASS" -deststorepass "$STORE_PASS" -srckeystore /home/circleci/.keystore -destkeystore /home/circleci/.keystore -deststoretype pkcs12 +keytool -keypasswd -alias $KEY_ALIAS -storepass $STORE_PASS -new $KEY_PASS -keystore ~/.keystore +rm keystore.gpg diff --git a/scripts/setup_sanitycheck_requirements.sh b/scripts/setup_sanitycheck_requirements.sh old mode 100644 new mode 100755 diff --git a/scripts/setup_tomtom_requirements.sh b/scripts/setup_tomtom_requirements.sh old mode 100644 new mode 100755 diff --git a/scripts/setup_wince.sh b/scripts/setup_wince.sh old mode 100644 new mode 100755 diff --git a/scripts/update_download_center.sh b/scripts/update_download_center.sh old mode 100644 new mode 100755 diff --git a/scripts/update_doxygen.sh b/scripts/update_doxygen.sh old mode 100644 new mode 100755 diff --git a/scripts/xdotools.sh b/scripts/xdotools.sh old mode 100644 new mode 100755 -- cgit v1.2.1