From ad6e1feb8a3a2da8a7bcc2b2a0342a97a412b338 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Fri, 7 Mar 2025 14:14:04 +0300 Subject: [PATCH 01/17] fix(github): action trigger --- .github/workflows/build_apk.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_apk.yaml b/.github/workflows/build_apk.yaml index bb9e8c2..8f514da 100644 --- a/.github/workflows/build_apk.yaml +++ b/.github/workflows/build_apk.yaml @@ -1,11 +1,10 @@ name: Build APK on: - pull_request: - # push: - # branches: - # - master - # - feat/add-release-apk-building + push: + branches: + - master + - feat/add-release-apk-building jobs: build_release_apk: @@ -80,4 +79,3 @@ jobs: # branch: ${{ github.ref }} # file_pattern: "release/*" # repo: ${{ github.repository }} - From 1e83e3d51c18cd38ba604e8e1517b8a6e9eadb9f Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Fri, 7 Mar 2025 14:21:16 +0300 Subject: [PATCH 02/17] refactor(github): rm unused --- .github/workflows/build_apk.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/build_apk.yaml b/.github/workflows/build_apk.yaml index 8f514da..e79154a 100644 --- a/.github/workflows/build_apk.yaml +++ b/.github/workflows/build_apk.yaml @@ -67,15 +67,3 @@ jobs: gh release create "v$TAG" ./release/app-prod-release.apk \ --title=$TAG \ --generate-notes - - # - name: Add release APK to git - # run: | - # git add release/app-prod-release.apk - # - # - name: Commit and push changes - # uses: planetscale/ghcommit-action@v0.1.44 - # with: - # commit_message: "chore: add release APK" - # branch: ${{ github.ref }} - # file_pattern: "release/*" - # repo: ${{ github.repository }} From d42f078e9d49a7e28b509fb5d4706b8dd3891485 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Fri, 7 Mar 2025 14:44:28 +0300 Subject: [PATCH 03/17] feat(github): action --- .github/workflows/publish.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index d927efd..416c65a 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,22 +1,26 @@ name: Publish to Play Store and Bump Version on: - push: - branches: - - master + pull_request: + # push: + # branches: + # - master jobs: publish_and_version_bump: - uses: rees46/workflow/.github/workflows/reusable-android-google-play-publish.yaml@master + # uses: rees46/workflow/.github/workflows/reusable-android-google-play-publish.yaml@master + # TODO uncomment + uses: rees46/workflow/.github/workflows/reusable-android-google-play-publish.yaml@fix/inputs with: packageName: "rees46.demo_shop" releaseFiles: "app/build/outputs/bundle/prodRelease/app-prod-release.aab" PROPERTIES_FILE: "version.properties" secrets: - PLAY_ACCOUNT_AS_BASE64: ${{ secrets.PLAY_ACCOUNT_AS_BASE64 }} # Google Play Auth for service account - KEYSTORE_AS_BASE64: ${{ secrets.KEYSTORE_AS_BASE64 }} # Keystore for singing release bundle + PLAY_ACCOUNT_AS_BASE64: ${{ secrets.PLAY_ACCOUNT_AS_BASE64 }} # Google Play Auth for service account + KEYSTORE_AS_BASE64: ${{ secrets.KEYSTORE_AS_BASE64 }} # Keystore for singing release bundle SIGNING_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }} SIGNING_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }} SIGNING_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }} GITHUB_APP_ID: ${{ vars.PUBLIVERSIONER_ID }} GITHUB_APP_PRIVATE_KEY: ${{ secrets.PUBLIVERSIONER_SECRET }} + GOOGLE_SERVICES_FILE_AS_BASE64: ${{ secrets.GOOGLE_SERVICES_FILE_AS_BASE64 }} From 5b78a4266dcbd7118777c002c9f0a55c629c565c Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Fri, 7 Mar 2025 15:37:19 +0300 Subject: [PATCH 04/17] feat(github): action --- buildConfig/src/main/kotlin/AppBuildConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildConfig/src/main/kotlin/AppBuildConfig.kt b/buildConfig/src/main/kotlin/AppBuildConfig.kt index 71e7a8c..935c122 100644 --- a/buildConfig/src/main/kotlin/AppBuildConfig.kt +++ b/buildConfig/src/main/kotlin/AppBuildConfig.kt @@ -234,4 +234,4 @@ class AppBuildConfig : Plugin { private const val PROGUARD_ANDROID_TXT = "proguard-android-optimize.txt" private const val PROGUARD_RULES = "proguard-rules.pro" } -} \ No newline at end of file +} From 00c4e0d37880d2bc43522e3ac4fa47fc07ea8fbf Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Fri, 7 Mar 2025 17:12:20 +0300 Subject: [PATCH 05/17] feat(github): action --- buildConfig/src/main/kotlin/AppBuildConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildConfig/src/main/kotlin/AppBuildConfig.kt b/buildConfig/src/main/kotlin/AppBuildConfig.kt index 935c122..50e1d42 100644 --- a/buildConfig/src/main/kotlin/AppBuildConfig.kt +++ b/buildConfig/src/main/kotlin/AppBuildConfig.kt @@ -112,7 +112,7 @@ class AppBuildConfig : Plugin { signingConfigs { create(RELEASE_CONFIG) { - storeFile = File( + storeFile = rootProject.file( localProperties.getProperty(RELEASE_STORE_FILE) ?: System.getenv("SIGNING_STORE_FILE") ) storePassword = localProperties.getProperty(RELEASE_STORE_PASSWORD) ?: System.getenv("SIGNING_STORE_PASSWORD") From 78c48b35ba4ed49d9c3d0c66e4da536588465c0d Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Fri, 7 Mar 2025 17:17:44 +0300 Subject: [PATCH 06/17] feat(github): action --- buildConfig/src/main/kotlin/AppBuildConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildConfig/src/main/kotlin/AppBuildConfig.kt b/buildConfig/src/main/kotlin/AppBuildConfig.kt index 50e1d42..935c122 100644 --- a/buildConfig/src/main/kotlin/AppBuildConfig.kt +++ b/buildConfig/src/main/kotlin/AppBuildConfig.kt @@ -112,7 +112,7 @@ class AppBuildConfig : Plugin { signingConfigs { create(RELEASE_CONFIG) { - storeFile = rootProject.file( + storeFile = File( localProperties.getProperty(RELEASE_STORE_FILE) ?: System.getenv("SIGNING_STORE_FILE") ) storePassword = localProperties.getProperty(RELEASE_STORE_PASSWORD) ?: System.getenv("SIGNING_STORE_PASSWORD") From 39b8d379626b56d6f4112e1745d3aea5053b0a71 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 15:31:02 +0300 Subject: [PATCH 07/17] feat(github): action --- fastlane/Fastfile | 24 ++++++++++++++++++++++++ scripts/decode-secrets.sh | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 fastlane/Fastfile create mode 100755 scripts/decode-secrets.sh diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 0000000..fa12e87 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,24 @@ +default_platform(:android) + +platform :android do + desc "Сборка и публикация в Google Play" + lane :deploy do + # Декодируем файлы перед сборкой + sh "../scripts/decode-secrets.sh" + + # Сборка AAB + gradle( + task: "bundle", + build_type: "Release", + flavor: "prod" + ) + + # Подпись AAB файла + upload_to_play_store( + track: "internal", + aab: "app/build/outputs/bundle/prodRelease/app-prod-release.aab", + json_key: "app/play-account.json", + package_name: "rees46.demo_shop" + ) + end +end diff --git a/scripts/decode-secrets.sh b/scripts/decode-secrets.sh new file mode 100755 index 0000000..d077c13 --- /dev/null +++ b/scripts/decode-secrets.sh @@ -0,0 +1,4 @@ +#!/bin/bash +echo "${PLAY_ACCOUNT_AS_BASE64}" | base64 --decode > android/app/play-account.json +echo "${KEYSTORE_AS_BASE64}" | base64 --decode > android/app/keystore.jks +echo "${GOOGLE_SERVICES_FILE_AS_BASE64}" | base64 --decode > android/app/google-services.json From 9c326c3adb73d945563b9224e11dd5d2d43a34da Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 15:33:39 +0300 Subject: [PATCH 08/17] feat(github): action --- .github/workflows/publish.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 416c65a..55d51ea 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -11,16 +11,16 @@ jobs: # uses: rees46/workflow/.github/workflows/reusable-android-google-play-publish.yaml@master # TODO uncomment uses: rees46/workflow/.github/workflows/reusable-android-google-play-publish.yaml@fix/inputs - with: - packageName: "rees46.demo_shop" - releaseFiles: "app/build/outputs/bundle/prodRelease/app-prod-release.aab" - PROPERTIES_FILE: "version.properties" + # with: + # packageName: "rees46.demo_shop" + # releaseFiles: "app/build/outputs/bundle/prodRelease/app-prod-release.aab" + # PROPERTIES_FILE: "version.properties" secrets: PLAY_ACCOUNT_AS_BASE64: ${{ secrets.PLAY_ACCOUNT_AS_BASE64 }} # Google Play Auth for service account KEYSTORE_AS_BASE64: ${{ secrets.KEYSTORE_AS_BASE64 }} # Keystore for singing release bundle + GOOGLE_SERVICES_FILE_AS_BASE64: ${{ secrets.GOOGLE_SERVICES_FILE_AS_BASE64 }} SIGNING_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }} SIGNING_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }} SIGNING_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }} - GITHUB_APP_ID: ${{ vars.PUBLIVERSIONER_ID }} - GITHUB_APP_PRIVATE_KEY: ${{ secrets.PUBLIVERSIONER_SECRET }} - GOOGLE_SERVICES_FILE_AS_BASE64: ${{ secrets.GOOGLE_SERVICES_FILE_AS_BASE64 }} + # GITHUB_APP_ID: ${{ vars.PUBLIVERSIONER_ID }} + # GITHUB_APP_PRIVATE_KEY: ${{ secrets.PUBLIVERSIONER_SECRET }} From bd8a6a833a83bb91248c94c47319da1c45177fab Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 15:35:13 +0300 Subject: [PATCH 09/17] feat(github): action --- scripts/decode-secrets.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/decode-secrets.sh b/scripts/decode-secrets.sh index d077c13..473d1fc 100755 --- a/scripts/decode-secrets.sh +++ b/scripts/decode-secrets.sh @@ -1,4 +1,4 @@ #!/bin/bash -echo "${PLAY_ACCOUNT_AS_BASE64}" | base64 --decode > android/app/play-account.json -echo "${KEYSTORE_AS_BASE64}" | base64 --decode > android/app/keystore.jks -echo "${GOOGLE_SERVICES_FILE_AS_BASE64}" | base64 --decode > android/app/google-services.json +echo "${PLAY_ACCOUNT_AS_BASE64}" | base64 --decode > app/play-account.json +echo "${KEYSTORE_AS_BASE64}" | base64 --decode > app/keystore.jks +echo "${GOOGLE_SERVICES_FILE_AS_BASE64}" | base64 --decode > app/google-services.json From 76372a4538143b91f178db91f6bdd58519e07129 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 15:43:51 +0300 Subject: [PATCH 10/17] refactor(github): useless --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..7a118b4 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" From e0638d1156f1c585b3508319d1137e821c15b93b Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 15:52:39 +0300 Subject: [PATCH 11/17] refactor(github): useless --- fastlane/Fastfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index fa12e87..ff1a784 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,17 +3,12 @@ default_platform(:android) platform :android do desc "Сборка и публикация в Google Play" lane :deploy do - # Декодируем файлы перед сборкой - sh "../scripts/decode-secrets.sh" - - # Сборка AAB gradle( task: "bundle", build_type: "Release", flavor: "prod" ) - # Подпись AAB файла upload_to_play_store( track: "internal", aab: "app/build/outputs/bundle/prodRelease/app-prod-release.aab", From 8a88b76f184999dde0ca53872de8eac86eea22ba Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 16:05:31 +0300 Subject: [PATCH 12/17] refactor(github): useless --- Gemfile | 1 + Gemfile.lock | 227 ++++++++++++++++++++++++++++++++++++++ fastlane/Fastfile | 2 + scripts/decode-secrets.sh | 6 +- 4 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile index 7a118b4..e846838 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source "https://rubygems.org" gem "fastlane" +gem "abbrev" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..8efbcd3 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,227 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + abbrev (0.1.2) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.1) + aws-partitions (1.1059.0) + aws-sdk-core (3.219.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.182.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + 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.7.0) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + 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) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (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-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.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 (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + 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, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.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.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.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) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + 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.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.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.8) + domain_name (~> 0.5) + httpclient (2.9.0) + mutex_m + jmespath (1.6.2) + json (2.10.1) + jwt (2.10.1) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) + naturally (2.2.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.4.1) + rouge (3.28.0) + ruby2_keywords (0.0.5) + rubyzip (2.4.1) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + 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.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.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.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) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + abbrev + fastlane + +BUNDLED WITH + 2.6.3 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ff1a784..67a5683 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,6 +3,8 @@ default_platform(:android) platform :android do desc "Сборка и публикация в Google Play" lane :deploy do + sh "../scripts/decode-secrets.sh" + gradle( task: "bundle", build_type: "Release", diff --git a/scripts/decode-secrets.sh b/scripts/decode-secrets.sh index 473d1fc..90492a1 100755 --- a/scripts/decode-secrets.sh +++ b/scripts/decode-secrets.sh @@ -1,4 +1,4 @@ #!/bin/bash -echo "${PLAY_ACCOUNT_AS_BASE64}" | base64 --decode > app/play-account.json -echo "${KEYSTORE_AS_BASE64}" | base64 --decode > app/keystore.jks -echo "${GOOGLE_SERVICES_FILE_AS_BASE64}" | base64 --decode > app/google-services.json +echo "${PLAY_ACCOUNT_AS_BASE64}" | base64 --decode > ../app/play-account.json +echo "${KEYSTORE_AS_BASE64}" | base64 --decode > ../app/keystore.jks +echo "${GOOGLE_SERVICES_FILE_AS_BASE64}" | base64 --decode > ../app/google-services.json From f0383f188fff7398971d6ecbf2c929a007ad0c89 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 16:07:08 +0300 Subject: [PATCH 13/17] refactor(github): useless --- fastlane/Fastfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 67a5683..ff1a784 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,8 +3,6 @@ default_platform(:android) platform :android do desc "Сборка и публикация в Google Play" lane :deploy do - sh "../scripts/decode-secrets.sh" - gradle( task: "bundle", build_type: "Release", From fc6cac426b633734e5e8e6f30b2d8729871f6a14 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 16:08:00 +0300 Subject: [PATCH 14/17] refactor(github): useless --- scripts/decode-secrets.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/decode-secrets.sh b/scripts/decode-secrets.sh index 90492a1..473d1fc 100755 --- a/scripts/decode-secrets.sh +++ b/scripts/decode-secrets.sh @@ -1,4 +1,4 @@ #!/bin/bash -echo "${PLAY_ACCOUNT_AS_BASE64}" | base64 --decode > ../app/play-account.json -echo "${KEYSTORE_AS_BASE64}" | base64 --decode > ../app/keystore.jks -echo "${GOOGLE_SERVICES_FILE_AS_BASE64}" | base64 --decode > ../app/google-services.json +echo "${PLAY_ACCOUNT_AS_BASE64}" | base64 --decode > app/play-account.json +echo "${KEYSTORE_AS_BASE64}" | base64 --decode > app/keystore.jks +echo "${GOOGLE_SERVICES_FILE_AS_BASE64}" | base64 --decode > app/google-services.json From c67bcea93b2c3724bfed284583c5b5c4640952c5 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 16:22:29 +0300 Subject: [PATCH 15/17] refactor(github): useless --- build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 52775fb..1330299 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false alias(libs.plugins.android.library) apply false + id("com.android.application") version "8.5.2" } buildscript { @@ -13,4 +14,4 @@ buildscript { classpath(libs.google.services) classpath(libs.androidx.navigation.safe.args.gradle.plugin) } -} \ No newline at end of file +} From 05401e7a05395a91d4871a562d2a615cea381655 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 16:24:36 +0300 Subject: [PATCH 16/17] refactor(github): useless --- build.gradle.kts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1330299..93b26d3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,15 +3,13 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false alias(libs.plugins.android.library) apply false - id("com.android.application") version "8.5.2" } buildscript { - repositories { - google() - } + repositories { google() } dependencies { classpath(libs.google.services) classpath(libs.androidx.navigation.safe.args.gradle.plugin) } } + From c6e209d3c726346331e7443222f6768525e2805e Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Mon, 10 Mar 2025 17:13:23 +0300 Subject: [PATCH 17/17] refactor(common): build WIP --- app/build.gradle.kts | 72 +++++++++++++++++++++++++++++++++++++++----- build.gradle.kts | 4 +++ gradle.properties | 8 ++++- 3 files changed, 76 insertions(+), 8 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e53a7c6..9f504df 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,10 +1,8 @@ plugins { - id("com.example.build.config") - alias(libs.plugins.android.application) - alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.triplet.plugin) id("com.google.gms.google-services") - id("androidx.navigation.safeargs.kotlin") + id("com.android.application") version "8.5.2" apply false + kotlin("android") } play { @@ -14,15 +12,72 @@ play { } android { - namespace = "rees46.demo_android.app" + compileSdk = 34 defaultConfig { - applicationId = "rees46.demo_shop" + applicationId = "rees46.demo_shop" + minSdk = 21 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + } + + buildTypes { + release { + isMinifyEnabled = false + } } } dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.appcompat) + implementation(libs.material) + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compat) + implementation(libs.androidx.navigation.fragment) + implementation(libs.androidx.navigation.fragment.ktx) + implementation(libs.androidx.navigation.ui.ktx) + implementation(libs.androidx.core.splashscreen) + implementation(libs.rees46.sdk) + implementation(project(":core")) + implementation(project(":feature")) + implementation(project(":navigation")) +} + + signingConfigs { + create("release") { + storeFile = file(System.getenv("KEYSTORE_PATH") ?: "keystore.jks") + storePassword = System.getenv("SIGNING_STORE_PASSWORD") ?: "password" + keyAlias = System.getenv("SIGNING_KEY_ALIAS") ?: "keyAlias" + keyPassword = System.getenv("SIGNING_KEY_PASSWORD") ?: "password" + } + } + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.appcompat) + implementation(libs.material) + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compat) + implementation(libs.androidx.navigation.fragment) + implementation(libs.androidx.navigation.fragment.ktx) + implementation(libs.androidx.navigation.ui.ktx) + implementation(libs.androidx.core.splashscreen) + implementation(libs.rees46.sdk) + implementation(project(":core")) + implementation(project(":feature")) + implementation(project(":navigation")) +} + isMinifyEnabled = false + signingConfig = signingConfigs.getByName("release") + } + } +} +dependencies { implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) implementation(libs.material) @@ -37,4 +92,7 @@ dependencies { implementation(project(":core")) implementation(project(":feature")) implementation(project(":navigation")) -} \ No newline at end of file +} + implementation(project(":feature")) + implementation(project(":navigation")) +} diff --git a/build.gradle.kts b/build.gradle.kts index 93b26d3..4f63027 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { + id("java") alias(libs.plugins.android.application) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false alias(libs.plugins.android.library) apply false @@ -13,3 +14,6 @@ buildscript { } } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) +} diff --git a/gradle.properties b/gradle.properties index ad6c072..cec9e4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,10 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -org.gradle.warning.mode=all \ No newline at end of file +org.gradle.warning.mode=all +android.enableJetifier=true + +org.gradle.jvmargs=-Xmx2048m +android.useAndroidX=true +android.enableJetifier=true +org.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64