From ab1abb5b5fbfb3a25af9b7fddab336e5fba293ae Mon Sep 17 00:00:00 2001 From: Max Starikov Date: Fri, 20 Dec 2024 14:38:48 +0100 Subject: [PATCH 01/11] update documentation and docke image version --- .gitlab-ci.yml | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12c103f..34084c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: maxistar/android:latest +image: maxistar/android:gradle_v8.10.1 before_script: - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' diff --git a/README.md b/README.md index d827f00..8e3f355 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,8 @@ In order to compile the application locally you will need to install [Android St Follow the documentation of how to open and compile your [first android application](https://developer.android.com/training/basics/firstapp). Once your setup is done, opening and compiling the existing project should not cause any difficulties. +in pipeline an application uses [maxistar/android](https://github.com/maxistar/android-docker-image) docker image + ### How to run sniffer ./gradlew lint From c10d02dd67619afb020c1a49ac2ac3d3666a9398 Mon Sep 17 00:00:00 2001 From: Max Starikov Date: Fri, 20 Dec 2024 14:50:09 +0100 Subject: [PATCH 02/11] update documentation and docke image version --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 8e3f355..af86827 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,7 @@ the reason of it either the author did not have enough time to implement it or n alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=com.maxistar.textpad) -This editor can be useful for editing of small texts, write down small notes etc... - -The application supports only plain text files. +This editor can be useful for editing of small texts, write down small notes etc... At the moment application supports only plain text files. The code is open so anyone can review code, send pull requests, new features, translations and so on. From 3466bec469b84153664570dc745afb39c45621d8 Mon Sep 17 00:00:00 2001 From: Maxim Starikov Date: Wed, 25 Dec 2024 11:06:39 +0000 Subject: [PATCH 03/11] Fix setup ci --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34084c3..e763f76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: maxistar/android:gradle_v8.10.1 +image: maxistar/android:latest before_script: - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' @@ -15,14 +15,13 @@ build: stage: build tags: - fomalgaut - script: - echo "Building" - cp local.properties.dist local.properties - - gradle assembleDebug + - gradle assembleDebug --no-daemon - gradle compileDebugSources - gradle compileDebugAndroidTestSources - - gradle assembleAndroidTest + - gradle assembleAndroidTest --no-daemon - echo "Upload compiled binaries" - scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk $PHYSICAL_DEVICE_RUNNER:$APK_LOCATION/app-debug-androidTest.apk - scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null app/build/outputs/apk/debug/app-debug.apk $PHYSICAL_DEVICE_RUNNER:$APK_LOCATION/app-debug.apk @@ -34,8 +33,8 @@ execute: - altair script: - echo "Execute Compliled Tests" - - adb -s $ADB_DEVICE_NAME uninstall com.maxistar.textpad.test - - adb -s $ADB_DEVICE_NAME uninstall com.maxistar.textpad + - adb -s $ADB_DEVICE_NAME uninstall com.maxistar.textpad.test || true + - adb -s $ADB_DEVICE_NAME uninstall com.maxistar.textpad || true - adb -s $ADB_DEVICE_NAME install -r -t -g -d $APK_LOCATION/app-debug-androidTest.apk - adb -s $ADB_DEVICE_NAME install -r -t -g -d $APK_LOCATION/app-debug.apk - echo "Run tests" From e325bee93664c920e6bfdc4a529a06eba70dbc78 Mon Sep 17 00:00:00 2001 From: Max Starikov Date: Fri, 10 Jan 2025 18:16:33 +0100 Subject: [PATCH 04/11] fix app name, closes #143 --- app/src/main/res/values-pl/strings.xml | 4 ++-- fastlane/metadata/android/pl-PL/title.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5b1c767..a1e492a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,7 +1,7 @@ - Prosty edytor tekstu - Prosty edytor tekstu - Ustawienia + Simple Text Editor + Simple Text Editor - Ustawienia Otwórz Otwórz ostatni Nowy diff --git a/fastlane/metadata/android/pl-PL/title.txt b/fastlane/metadata/android/pl-PL/title.txt index fd6a8e9..137e8c5 100644 --- a/fastlane/metadata/android/pl-PL/title.txt +++ b/fastlane/metadata/android/pl-PL/title.txt @@ -1 +1 @@ -Prosty edytor tekstu +Simple Text Editor From dbad859de6c715a2d8ebbcafd8777257e1897344 Mon Sep 17 00:00:00 2001 From: Max Starikov Date: Sat, 27 Apr 2024 16:59:36 +0200 Subject: [PATCH 05/11] add wakelock service --- app/src/main/AndroidManifest.xml | 2 + .../com/maxistar/textpad/ServiceLocator.java | 12 ++++++ .../textpad/activities/EditorActivity.java | 3 ++ .../textpad/service/WakeLockService.java | 43 +++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 app/src/main/java/com/maxistar/textpad/service/WakeLockService.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 24fea5a..05535b4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,8 @@ + + Date: Wed, 22 May 2024 19:19:41 +0200 Subject: [PATCH 06/11] add wake lock --- .../com/maxistar/textpad/activities/EditorActivity.java | 8 ++++++-- .../com/maxistar/textpad/service/SettingsService.java | 8 ++++++++ .../com/maxistar/textpad/service/WakeLockService.java | 3 --- app/src/main/res/values-ar/strings.xml | 3 +++ app/src/main/res/values-cn/strings.xml | 3 +++ app/src/main/res/values-de/strings.xml | 3 +++ app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-ja/strings.xml | 2 ++ app/src/main/res/values-pl/strings.xml | 2 ++ app/src/main/res/values-pt/strings.xml | 2 ++ app/src/main/res/values-ru/strings.xml | 2 ++ app/src/main/res/values-tr/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml/preferences.xml | 6 ++++++ 16 files changed, 47 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/maxistar/textpad/activities/EditorActivity.java b/app/src/main/java/com/maxistar/textpad/activities/EditorActivity.java index 96e69df..8099e08 100644 --- a/app/src/main/java/com/maxistar/textpad/activities/EditorActivity.java +++ b/app/src/main/java/com/maxistar/textpad/activities/EditorActivity.java @@ -272,7 +272,9 @@ protected void onResume() { startActivity(intent); } - ServiceLocator.getInstance().getWakeLockService().acquireLock(this.getApplicationContext()); + if (settingsService.useWakeLock()) { + ServiceLocator.getInstance().getWakeLockService().acquireLock(this.getApplicationContext()); + } } protected void onPause() { @@ -282,7 +284,9 @@ protected void onPause() { mText.removeTextChangedListener(textWatcher); selectionStart = mText.getSelectionStart(); - ServiceLocator.getInstance().getWakeLockService().releaseLock(); + if (settingsService.useWakeLock()) { + ServiceLocator.getInstance().getWakeLockService().releaseLock(); + } super.onPause(); } diff --git a/app/src/main/java/com/maxistar/textpad/service/SettingsService.java b/app/src/main/java/com/maxistar/textpad/service/SettingsService.java index c308d30..06ad2ba 100644 --- a/app/src/main/java/com/maxistar/textpad/service/SettingsService.java +++ b/app/src/main/java/com/maxistar/textpad/service/SettingsService.java @@ -28,6 +28,7 @@ public class SettingsService { public static final String SETTING_ALTERNATIVE_FILE_ACCESS = "use_alternative_file_access"; public static final String SETTING_SHOW_LAST_EDITED_FILES = "show_last_edited_files"; + private static final String SETTING_USE_WAKE_LOCK = "use_wake_lock"; public static final String SETTING_MEDIUM = "Medium"; public static final String SETTING_EXTRA_SMALL = "Extra Small"; @@ -71,6 +72,8 @@ public class SettingsService { private int searchSelectionColor; private int textSelectionColor; + private boolean useWakeLock = false; + private static boolean languageWasChanged = false; @@ -82,6 +85,7 @@ public void loadSettings(Context context) { open_last_file = sharedPref.getBoolean(SETTING_OPEN_LAST_FILE, false); show_last_edited_files = sharedPref.getBoolean(SETTING_SHOW_LAST_EDITED_FILES, true); legacy_file_picker = sharedPref.getBoolean(SETTING_LEGASY_FILE_PICKER, false); + useWakeLock= sharedPref.getBoolean(SETTING_USE_WAKE_LOCK, false); alternative_file_access = sharedPref.getBoolean(SETTING_ALTERNATIVE_FILE_ACCESS, true); last_filename = sharedPref.getString(SETTING_LAST_FILENAME, TPStrings.EMPTY); file_encoding = sharedPref.getString(SETTING_FILE_ENCODING, TPStrings.UTF_8); @@ -261,4 +265,8 @@ public boolean isCustomTheme() { public String getColorThemeType() { return this.colorThemeType; } + + public boolean useWakeLock() { + return this.useWakeLock; + } } diff --git a/app/src/main/java/com/maxistar/textpad/service/WakeLockService.java b/app/src/main/java/com/maxistar/textpad/service/WakeLockService.java index 71337dd..295c482 100644 --- a/app/src/main/java/com/maxistar/textpad/service/WakeLockService.java +++ b/app/src/main/java/com/maxistar/textpad/service/WakeLockService.java @@ -36,8 +36,5 @@ public void releaseLock() { } catch (Exception e) { Log.e("ERROR", e.toString()); } - } - - } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9a32228..aa16064 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -99,5 +99,8 @@ مظلم مخصص + استخدم ويكلوك + منع الجهاز من الدخول في وضع السكون + \ No newline at end of file diff --git a/app/src/main/res/values-cn/strings.xml b/app/src/main/res/values-cn/strings.xml index a0114af..c5bce52 100644 --- a/app/src/main/res/values-cn/strings.xml +++ b/app/src/main/res/values-cn/strings.xml @@ -100,5 +100,8 @@ 黑暗的 风俗 + 使用唤醒锁 + 防止设备进入睡眠模式 + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8a0bca6..ca1abe9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -99,5 +99,8 @@ Dunkel Brauch + Verwenden WakeLock + Verhindern, dass das Gerät in den Ruhemodus wechselt + \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4666f3d..6750cd7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -99,5 +99,7 @@ Oscura Costumbre + Usar WakeLock + Evitar que el dispositivo entre en modo de suspensión diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d907e03..bac37a8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -99,5 +99,7 @@ Sombre Coutume + Utiliser WakeLock + Empêcher l\'appareil de passer en mode veille \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 666f50f..e8e6fea 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -99,5 +99,7 @@ Buia Costume + Usa WakeLock + Impedisce al dispositivo di entrare in modalità sospensione diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c68be50..9f291f2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -99,5 +99,7 @@ 暗い カスタム + ウェイクロックを使用する + デバイスがスリープモードになるのを防ぐ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a1e492a..db4139f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -99,5 +99,7 @@ Ciemny Zwyczaj + Użyj funkcji WakeLock + Zapobiegaj przejściu urządzenia w tryb uśpienia diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fe00580..3043f7d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -99,5 +99,7 @@ Escura Personalizada + Usar WakeLock + Impedir que o dispositivo entre no modo de suspensão diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0e8a30d..67f183f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -99,5 +99,7 @@ Темная Пользовательская + Использовать WakeLock + Запретить переход устройства в спящий режим diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 21f5de3..9d6330a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -100,5 +100,7 @@ Karanlık Gelenek + WakeLock\'u kullanın + Cihazın uyku moduna geçmesini önleyin \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7edab87..f781e3e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,6 +102,8 @@ Light Dark Custom + Use WakeLock + Prevent device going to sleep mode diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index b14e053..ff700b6 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -20,6 +20,12 @@ android:summary="@string/preferenceAutoSaveCurrentFileDescription" android:defaultValue="false" /> + + Date: Fri, 10 Jan 2025 18:44:48 +0100 Subject: [PATCH 07/11] remove extra permission --- app/src/main/AndroidManifest.xml | 1 - .../com/maxistar/textpad/activities/EditorActivity.java | 3 ++- .../java/com/maxistar/textpad/service/WakeLockService.java | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 05535b4..42d3cea 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,6 @@ - Date: Fri, 10 Jan 2025 19:16:56 +0100 Subject: [PATCH 08/11] update security warning --- Gemfile | 1 + Gemfile.lock | 4 +++- fastlane/report.xml | 9 ++------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 7a118b4..d037405 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source "https://rubygems.org" gem "fastlane" +gem "jmespath", ">= 1.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index 93210ea..aa10956 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,7 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.4.0) + jmespath (1.6.2) json (2.6.1) jwt (2.3.0) memoist (0.16.2) @@ -205,10 +205,12 @@ GEM xcpretty (~> 0.2, >= 0.0.7) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES fastlane + jmespath (>= 1.6.1) BUNDLED WITH 2.2.29 diff --git a/fastlane/report.xml b/fastlane/report.xml index ea6a0b4..b244819 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,12 @@ - + - - - - - - + From 05f792e8c86225b912eb5f05451927aa7b017fe6 Mon Sep 17 00:00:00 2001 From: Max Starikov Date: Fri, 10 Jan 2025 19:19:29 +0100 Subject: [PATCH 09/11] fix security warning --- Gemfile | 1 + Gemfile.lock | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d037405..c34d02b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,4 @@ source "https://rubygems.org" gem "fastlane" gem "jmespath", ">= 1.6.1" +gem "webrick", ">= 1.8.2" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index aa10956..7b4f93b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,7 +190,7 @@ GEM unf_ext unf_ext (0.0.8) unicode-display_width (1.8.0) - webrick (1.7.0) + webrick (1.9.1) word_wrap (1.0.0) xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) @@ -211,6 +211,7 @@ PLATFORMS DEPENDENCIES fastlane jmespath (>= 1.6.1) + webrick (>= 1.8.2) BUNDLED WITH 2.2.29 From bc9e9e3a41927b64bb3f6d4c9264abbf52f2ced7 Mon Sep 17 00:00:00 2001 From: Max Starikov Date: Fri, 10 Jan 2025 19:22:53 +0100 Subject: [PATCH 10/11] update fastlane --- Gemfile | 4 +- Gemfile.lock | 199 +++++++++++++++++++++++--------------------- fastlane/report.xml | 4 +- 3 files changed, 105 insertions(+), 102 deletions(-) diff --git a/Gemfile b/Gemfile index c34d02b..adc90d9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,3 @@ source "https://rubygems.org" -gem "fastlane" -gem "jmespath", ">= 1.6.1" -gem "webrick", ">= 1.8.2" \ No newline at end of file +gem "fastlane" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 7b4f93b..a12b376 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,52 +1,55 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.4) + CFPropertyList (3.0.7) + base64 + nkf rexml - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - artifactory (3.0.15) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.519.0) - aws-sdk-core (3.121.3) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.50.0) - aws-sdk-core (~> 3, >= 3.121.2) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.104.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-eventstream (1.3.0) + aws-partitions (1.1034.0) + aws-sdk-core (3.214.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.177.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - claide (1.0.3) + base64 (0.2.0) + claide (1.1.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) declarative (0.0.20) - digest-crc (0.6.4) + digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) + domain_name (0.6.20240107) + dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.87.0) - faraday (1.8.0) + excon (0.112.0) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -55,21 +58,24 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - faraday_middleware (1.2.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.2.5) - fastlane (2.197.0) + fastimage (2.4.0) + fastlane (2.226.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored + colored (~> 1.2) commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) @@ -78,33 +84,38 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) google-cloud-storage (~> 1.31) highline (~> 2.0) + http-cookie (~> 1.0.5) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) + multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (~> 0.1.1) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) + terminal-table (~> 3) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty (~> 0.4.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.13.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.4.1) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -112,95 +123,91 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - webrick - google-apis-iamcredentials_v1 (0.8.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.6.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.9.0) - google-apis-core (>= 0.4, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.2.0) - google-cloud-storage (1.34.1) - addressable (~> 2.5) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.1.0) - faraday (>= 0.17.3, < 2.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.4) + http-cookie (1.0.8) domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.6.1) - jwt (2.3.0) - memoist (0.16.2) - mini_magick (4.11.0) - mini_mime (1.1.2) + json (2.9.1) + jwt (2.10.1) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.0.0) - nanaimo (0.3.0) + multipart-post (2.4.1) + nanaimo (0.4.0) naturally (2.2.1) - optparse (0.1.1) - os (1.1.1) - plist (3.6.0) - public_suffix (4.0.6) - rake (13.0.6) - representable (3.1.1) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.2) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) - rouge (2.0.7) + rexml (3.4.0) + rouge (3.28.0) ruby2_keywords (0.0.5) - rubyzip (2.3.2) - security (0.1.3) - signet (0.16.0) + rubyzip (2.4.1) + security (0.1.5) + signet (0.19.0) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally + sysrandom (1.0.5) terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8) - unicode-display_width (1.8.0) - webrick (1.9.1) + unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.21.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -210,8 +217,6 @@ PLATFORMS DEPENDENCIES fastlane - jmespath (>= 1.6.1) - webrick (>= 1.8.2) BUNDLED WITH 2.2.29 diff --git a/fastlane/report.xml b/fastlane/report.xml index b244819..8af4dc2 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,12 +5,12 @@ - + - + From 87011483108f5d093be3bff96c07ce497e1c578f Mon Sep 17 00:00:00 2001 From: Max Starikov Date: Sun, 12 Jan 2025 16:01:17 +0100 Subject: [PATCH 11/11] a new release --- app/src/main/AndroidManifest.xml | 4 ++-- fastlane/metadata/android/en-US/changelogs/48.txt | 2 ++ fastlane/metadata/android/es-ES/changelogs/48.txt | 2 ++ fastlane/metadata/android/pl-PL/changelogs/48.txt | 2 ++ fastlane/metadata/android/ru-RU/changelogs/48.txt | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/48.txt create mode 100644 fastlane/metadata/android/es-ES/changelogs/48.txt create mode 100644 fastlane/metadata/android/pl-PL/changelogs/48.txt create mode 100644 fastlane/metadata/android/ru-RU/changelogs/48.txt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 42d3cea..b9a9076 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="48" + android:versionName="1.26.4" > diff --git a/fastlane/metadata/android/en-US/changelogs/48.txt b/fastlane/metadata/android/en-US/changelogs/48.txt new file mode 100644 index 0000000..b2616d0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/48.txt @@ -0,0 +1,2 @@ +- improved translations +- prevent going to sleep mode when editor is active \ No newline at end of file diff --git a/fastlane/metadata/android/es-ES/changelogs/48.txt b/fastlane/metadata/android/es-ES/changelogs/48.txt new file mode 100644 index 0000000..a0622be --- /dev/null +++ b/fastlane/metadata/android/es-ES/changelogs/48.txt @@ -0,0 +1,2 @@ +- traducciones mejoradas +- evitar pasar al modo de suspensión cuando el editor está activo \ No newline at end of file diff --git a/fastlane/metadata/android/pl-PL/changelogs/48.txt b/fastlane/metadata/android/pl-PL/changelogs/48.txt new file mode 100644 index 0000000..3ae86e8 --- /dev/null +++ b/fastlane/metadata/android/pl-PL/changelogs/48.txt @@ -0,0 +1,2 @@ +- ulepszone tłumaczenia +- zapobieganie przechodzeniu w tryb uśpienia, gdy edytor jest aktywny \ No newline at end of file diff --git a/fastlane/metadata/android/ru-RU/changelogs/48.txt b/fastlane/metadata/android/ru-RU/changelogs/48.txt new file mode 100644 index 0000000..6215471 --- /dev/null +++ b/fastlane/metadata/android/ru-RU/changelogs/48.txt @@ -0,0 +1,2 @@ +- улучшены переводы +- предотвращение перехода в спящий режим, когда редактор активен \ No newline at end of file