From d9b360ad96fb4142c6f7b005db27d7aaa015021c Mon Sep 17 00:00:00 2001 From: Yurt Page Date: Sat, 4 May 2024 22:58:19 +0300 Subject: [PATCH 1/7] fastlane i18n ru --- metadata/ru/full_description.txt | 6 ++++++ metadata/ru/short_description.txt | 1 + 2 files changed, 7 insertions(+) create mode 100644 metadata/ru/full_description.txt create mode 100644 metadata/ru/short_description.txt diff --git a/metadata/ru/full_description.txt b/metadata/ru/full_description.txt new file mode 100644 index 0000000..45a6ca6 --- /dev/null +++ b/metadata/ru/full_description.txt @@ -0,0 +1,6 @@ +Bluetooth Radar в фоновом режиме сканирует и анализирует окружающие вас устройства с низким энергопотреблением Bluetooth (например, умные часы, наушники, колонки) и позволяет устанавливать сложные правила поиска устройств по указанным фильтрам. +Например, по названию устройства, адресу, местоположению и времени обнаружения, производителю, а также в случае, если неизвестное устройство преследует вас в течение длительного времени. +Может использоваться для поиска пропавших устройств или уведомления вас если устройство человека, которого вы ищете, находится поблизости. + +Bluetooth Radar не собирает и не отправляет ваши личные данные или местоположение. +Это свободный проект и код доступен на GitHub. \ No newline at end of file diff --git a/metadata/ru/short_description.txt b/metadata/ru/short_description.txt new file mode 100644 index 0000000..5f93555 --- /dev/null +++ b/metadata/ru/short_description.txt @@ -0,0 +1 @@ +Инструмент для мониторинга, анализа и поиска устройств BLE вокруг вас \ No newline at end of file From 6a3f3a167cb6486d605c5bdd9fa5de7fe66fdd00 Mon Sep 17 00:00:00 2001 From: Yurt Page Date: Mon, 6 May 2024 13:55:54 +0300 Subject: [PATCH 2/7] Update metadata/ru/full_description.txt Co-authored-by: Konstantin Kulikov --- metadata/ru/full_description.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/ru/full_description.txt b/metadata/ru/full_description.txt index 45a6ca6..27e9f98 100644 --- a/metadata/ru/full_description.txt +++ b/metadata/ru/full_description.txt @@ -1,4 +1,4 @@ -Bluetooth Radar в фоновом режиме сканирует и анализирует окружающие вас устройства с низким энергопотреблением Bluetooth (например, умные часы, наушники, колонки) и позволяет устанавливать сложные правила поиска устройств по указанным фильтрам. +Bluetooth Radar в фоновом режиме сканирует и анализирует окружающие вас устройства Bluetooth Low Energy (например, умные часы, наушники, колонки) и позволяет устанавливать сложные правила поиска устройств по указанным фильтрам. Например, по названию устройства, адресу, местоположению и времени обнаружения, производителю, а также в случае, если неизвестное устройство преследует вас в течение длительного времени. Может использоваться для поиска пропавших устройств или уведомления вас если устройство человека, которого вы ищете, находится поблизости. From eb2db7afed7e69cbbb2d4fef384a32e1363f00a9 Mon Sep 17 00:00:00 2001 From: Konstantin Kulikov Date: Mon, 6 May 2024 14:44:48 +0300 Subject: [PATCH 3/7] Update full_description.txt --- metadata/ru/full_description.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/ru/full_description.txt b/metadata/ru/full_description.txt index 27e9f98..2e79e08 100644 --- a/metadata/ru/full_description.txt +++ b/metadata/ru/full_description.txt @@ -3,4 +3,4 @@ Bluetooth Radar в фоновом режиме сканирует и анали Может использоваться для поиска пропавших устройств или уведомления вас если устройство человека, которого вы ищете, находится поблизости. Bluetooth Radar не собирает и не отправляет ваши личные данные или местоположение. -Это свободный проект и код доступен на GitHub. \ No newline at end of file +Это свободное ПО и код проекта доступен на Github. From 513d4ac8bb8d21d814ac76e2628fd483e7c079b5 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Thu, 1 Aug 2024 15:00:33 -0700 Subject: [PATCH 4/7] Update dependencies --- app/build.gradle.kts | 11 +++++----- build.gradle.kts | 1 + gradle/libs.versions.toml | 27 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2d4b36c..31644c9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,6 +5,7 @@ plugins { id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("androidx.room") + alias(libs.plugins.compose.compiler) } room { @@ -51,10 +52,10 @@ android { keyPassword = "metaradar-debug-keystore" } maybeCreate(RELEASE).apply { - storeFile = file(gradleLocalProperties(rootDir).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: "/")) - storePassword = gradleLocalProperties(rootDir).getProperty("releaseStorePassword", System.getenv("RELEASE_STORE_PASSWORD") ?: "") - keyAlias = gradleLocalProperties(rootDir).getProperty("releaseKeyAlias", System.getenv("RELEASE_STORE_KEY") ?: "") - keyPassword = gradleLocalProperties(rootDir).getProperty("releaseKeyPassword", System.getenv("RELEASE_STORE_KEY_PASSWORD") ?: "") + storeFile = file(gradleLocalProperties(rootDir, providers).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: "/")) + storePassword = gradleLocalProperties(rootDir, providers).getProperty("releaseStorePassword", System.getenv("RELEASE_STORE_PASSWORD") ?: "") + keyAlias = gradleLocalProperties(rootDir, providers).getProperty("releaseKeyAlias", System.getenv("RELEASE_STORE_KEY") ?: "") + keyPassword = gradleLocalProperties(rootDir, providers).getProperty("releaseKeyPassword", System.getenv("RELEASE_STORE_KEY_PASSWORD") ?: "") } } @@ -71,7 +72,7 @@ android { isShrinkResources = true isDebuggable = false - val hasSignConfig = gradleLocalProperties(rootDir).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: NO_SIGNING_CONFIG) != NO_SIGNING_CONFIG + val hasSignConfig = gradleLocalProperties(rootDir, providers).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: NO_SIGNING_CONFIG) != NO_SIGNING_CONFIG signingConfig = if (hasSignConfig) signingConfigs[RELEASE] else null proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") diff --git a/build.gradle.kts b/build.gradle.kts index 61b5298..2c5d41f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ plugins { alias(libs.plugins.android.lib) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.serialization) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.kotlin.ksp) apply false alias(libs.plugins.room) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c428cb4..50c2770 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,21 @@ [versions] # You also need to bump the version of ksp, anvil, compose -kotlin-general = "1.9.21" +kotlin-general = "2.0.0" kotlinx = "1.7.3" -ksp = "1.9.21-1.0.16" +ksp = "2.0.0-1.0.24" anvil = "2.4.2" -android-gradle = "8.2.0" +android-gradle = "8.5.1" protobuf = "3.21.7" protobuf-gradle = "0.9.1" # Protobuf JVM library https://github.com/flipperdevices/flipperzero-protobuf-jvm protobuf-jvm = "0.12.0-0.3.0" -compose = "1.5.4" +compose = "1.6.8" compose-wear = "1.0.2" compose-compiler = "1.5.6" compose-accompanist = "0.28.0" compose-constraint = "1.0.1" -compose-navigation = "2.5.2" -compose-material3 = "1.2.0-beta01" +compose-navigation = "2.7.7" +compose-material3 = "1.2.1" horologist = "0.1.13" serialization-json = "1.4.0" wear = "1.2.0" @@ -31,19 +31,19 @@ sentry-gradle = "3.2.0" zip4j = "2.11.2" seismic = "1.0.3" cicerone = "7.1" -ktx = "1.12.0" +ktx = "1.13.1" ktx-fragment = "1.6.2" -ktx-activity = "1.8.2" +ktx-activity = "1.9.1" ktx-testing = "1.1.5" -lifecycle = "2.5.1" +lifecycle = "2.8.4" # https://github.com/vigna/fastutil/issues/136 fastutil = "7.2.1" ble = "2.5.1" ble-scan = "1.6.0" lottie = "5.2.0" -material = "1.6.1" -annotations = "1.4.0" -appcompat = "1.5.1" +material = "1.12.0" +annotations = "1.8.1" +appcompat = "1.7.0" datastore = "1.0.0" # https://github.com/vsch/flexmark-java/issues/442 flexmark = "0.42.14" @@ -59,7 +59,7 @@ detekt-gradle = "1.21.0" grgit-gradle = "8d818b74b9" tangle = "0.15.1" work = "2.7.1" -concurrent = "1.1.0" +concurrent = "1.2.0" koin = "3.2.2" koin-android = "3.3.0" koin-android-compose = "3.3.0" @@ -252,3 +252,4 @@ ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" } protobuf = { id = "com.google.protobuf", version.ref = "protobuf-gradle" } square-anvil = { id = "com.squareup.anvil", version.ref = "anvil" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin-general" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0405be7..677b7be 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Dec 18 19:58:11 EET 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 37a4a6868e7e48d5a7c57948ef74ac11440d8dc2 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Thu, 1 Aug 2024 15:44:39 -0700 Subject: [PATCH 5/7] Update jdk and gradle --- app/build.gradle.kts | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 31644c9..d4504f5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -108,16 +108,16 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_22 + targetCompatibility = JavaVersion.VERSION_22 } kotlin { - jvmToolchain(17) + jvmToolchain(22) } kotlinOptions { - jvmTarget = "17" + jvmTarget = "22" } buildFeatures.apply { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 677b7be..9a41ad2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 18 19:58:11 EET 2023 +#Thu Aug 01 15:27:36 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 2bf17b581fcbdc31f13722c7668fea196496ce76 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Thu, 1 Aug 2024 15:48:50 -0700 Subject: [PATCH 6/7] Update CI scripts --- .github/workflows/build_check.yml | 6 +++--- .github/workflows/publish_debug.yml | 6 +++--- .github/workflows/publish_release.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 68a7330..80e3a9a 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -12,11 +12,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 17 + - name: set up JDK 22 uses: actions/setup-java@v3 with: - java-version: '17' - distribution: 'temurin' + java-version: '22' + distribution: 'oracle' cache: gradle - name: Grant execute permission for gradlew diff --git a/.github/workflows/publish_debug.yml b/.github/workflows/publish_debug.yml index e1ca117..544dc2d 100644 --- a/.github/workflows/publish_debug.yml +++ b/.github/workflows/publish_debug.yml @@ -12,11 +12,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 17 + - name: set up JDK 22 uses: actions/setup-java@v3 with: - java-version: '17' - distribution: 'temurin' + java-version: '22' + distribution: 'oracle' cache: gradle - name: Grant execute permission for gradlew diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 2ca6954..6e4b69f 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 17 + - name: set up JDK 22 uses: actions/setup-java@v3 with: - java-version: '17' - distribution: 'temurin' + java-version: '22' + distribution: 'oracle' cache: gradle - name: Grant execute permission for gradlew From fe77725e100d61fd03c4be99f4389779860988ac Mon Sep 17 00:00:00 2001 From: Konstantin Date: Thu, 1 Aug 2024 15:51:29 -0700 Subject: [PATCH 7/7] Update the app version --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d4504f5..0ae9917 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -25,8 +25,8 @@ android { minSdk = 29 targetSdk = 34 - versionCode = 1708536355 - versionName = "0.25.3-beta" + versionCode = 1708536356 + versionName = "0.26.0-beta" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"