From 92785043559c7cbbab8d59beb9500687d7a96304 Mon Sep 17 00:00:00 2001 From: Wavesonics Date: Wed, 9 Aug 2023 20:54:45 -0700 Subject: [PATCH] Working on Android publishing --- .github/workflows/publish.yml | 11 +++++------ .gitignore | 5 +++++ GemFile | 3 --- android/Gemfile => Gemfile | 0 android/Gemfile.lock => Gemfile.lock | 0 android/.gitignore | 3 --- {android/fastlane => fastlane}/Appfile | 0 {android/fastlane => fastlane}/Fastfile | 14 +++++++------- .../metadata/android/en-US/changelogs/11.txt | 0 .../metadata/android/en-US/full_description.txt | 0 .../android/en-US/images/featureGraphic.png | Bin .../metadata/android/en-US/images/icon.png | Bin .../en-US/images/phoneScreenshots/1_en-US.png | Bin .../en-US/images/phoneScreenshots/2_en-US.jpeg | Bin .../en-US/images/phoneScreenshots/3_en-US.png | Bin .../en-US/images/phoneScreenshots/4_en-US.jpeg | Bin .../en-US/images/sevenInchScreenshots/1_en-US.png | Bin .../en-US/images/sevenInchScreenshots/2_en-US.png | Bin .../en-US/images/sevenInchScreenshots/3_en-US.png | Bin .../en-US/images/tenInchScreenshots/1_en-US.png | Bin .../en-US/images/tenInchScreenshots/2_en-US.png | Bin .../en-US/images/tenInchScreenshots/3_en-US.png | Bin .../metadata/android/en-US/short_description.txt | 0 .../metadata/android/en-US/title.txt | 0 .../metadata/android/en-US/video.txt | 0 25 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 GemFile rename android/Gemfile => Gemfile (100%) rename android/Gemfile.lock => Gemfile.lock (100%) delete mode 100644 android/.gitignore rename {android/fastlane => fastlane}/Appfile (100%) rename {android/fastlane => fastlane}/Fastfile (80%) rename {android/fastlane => fastlane}/metadata/android/en-US/changelogs/11.txt (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/full_description.txt (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/featureGraphic.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/icon.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/phoneScreenshots/1_en-US.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/phoneScreenshots/3_en-US.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/sevenInchScreenshots/3_en-US.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/images/tenInchScreenshots/3_en-US.png (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/short_description.txt (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/title.txt (100%) rename {android/fastlane => fastlane}/metadata/android/en-US/video.txt (100%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1756dfdf4..d1895a95a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6' + ruby-version: '3.2.2' bundler-cache: true - name: Cache Ruby - Bundler @@ -57,8 +57,8 @@ jobs: - name: Create Google Play Config file run: | - echo "$PLAY_CONFIG_JSON" > android/play_config.json.b64 - base64 -d -i android/play_config.json.b64 > android/play_config.json + echo "$PLAY_CONFIG_JSON" > play_config.json.b64 + base64 -d -i play_config.json.b64 > play_config.json env: PLAY_CONFIG_JSON: ${{ secrets.PLAY_CONFIG_JSON }} @@ -66,10 +66,9 @@ jobs: run: echo "{{ EVENT_PAYLOAD.release.description }}" > changelog.txt - name: Distribute app to Production track 🚀 - run: | - cd android - bundle exec fastlane release + run: bundle exec fastlane release notify: + needs: publish-google-play runs-on: ubuntu-latest steps: - name: Discord notification diff --git a/.gitignore b/.gitignore index 3ba5c45b1..1c4e3f60b 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,8 @@ bin/ wix311/ /android/release/android-release.aab + +# Fastlane +play_config.json +fastlane/report.xml +fastlane/README.md \ No newline at end of file diff --git a/GemFile b/GemFile deleted file mode 100644 index adc90d98c..000000000 --- a/GemFile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "fastlane" \ No newline at end of file diff --git a/android/Gemfile b/Gemfile similarity index 100% rename from android/Gemfile rename to Gemfile diff --git a/android/Gemfile.lock b/Gemfile.lock similarity index 100% rename from android/Gemfile.lock rename to Gemfile.lock diff --git a/android/.gitignore b/android/.gitignore deleted file mode 100644 index 9da2ff2be..000000000 --- a/android/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -play_config.json -fastlane/report.xml -fastlane/README.md \ No newline at end of file diff --git a/android/fastlane/Appfile b/fastlane/Appfile similarity index 100% rename from android/fastlane/Appfile rename to fastlane/Appfile diff --git a/android/fastlane/Fastfile b/fastlane/Fastfile similarity index 80% rename from android/fastlane/Fastfile rename to fastlane/Fastfile index bbeb69915..b902bc7d6 100644 --- a/android/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -20,36 +20,36 @@ platform :android do lane :test do gradle( task: "test", - gradle_path: "../gradlew" + gradle_path: "./gradlew" ) end desc "Submit a new Beta Build to Google Play Internal" lane :alpha do - changelog = File.read("../changelog.txt") + changelog = File.read("changelog.txt") gradle( task: ":android:bundleRelease", - gradle_path: "../gradlew" + gradle_path: "./gradlew" ) upload_to_play_store(track: 'alpha') end desc "Submit a new Beta Build to Google Play Internal" lane :beta do - changelog = File.read("../changelog.txt") + changelog = File.read("changelog.txt") gradle( task: ":android:bundleRelease", - gradle_path: "../gradlew" + gradle_path: "./gradlew" ) upload_to_play_store(track: 'beta') end desc "Deploy a new version to the Google Play" lane :release do - changelog = File.read("../changelog.txt") + changelog = File.read("changelog.txt") gradle( task: "clean bundleRelease", - gradle_path: "../gradlew" + gradle_path: "./gradlew" ) upload_to_play_store end diff --git a/android/fastlane/metadata/android/en-US/changelogs/11.txt b/fastlane/metadata/android/en-US/changelogs/11.txt similarity index 100% rename from android/fastlane/metadata/android/en-US/changelogs/11.txt rename to fastlane/metadata/android/en-US/changelogs/11.txt diff --git a/android/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt similarity index 100% rename from android/fastlane/metadata/android/en-US/full_description.txt rename to fastlane/metadata/android/en-US/full_description.txt diff --git a/android/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/featureGraphic.png rename to fastlane/metadata/android/en-US/images/featureGraphic.png diff --git a/android/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/icon.png rename to fastlane/metadata/android/en-US/images/icon.png diff --git a/android/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png diff --git a/android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg similarity index 100% rename from android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg rename to fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg diff --git a/android/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png rename to fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png diff --git a/android/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg similarity index 100% rename from android/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg rename to fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg diff --git a/android/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png rename to fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png diff --git a/android/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.png rename to fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.png diff --git a/android/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3_en-US.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3_en-US.png rename to fastlane/metadata/android/en-US/images/sevenInchScreenshots/3_en-US.png diff --git a/android/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png rename to fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png diff --git a/android/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png rename to fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png diff --git a/android/fastlane/metadata/android/en-US/images/tenInchScreenshots/3_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3_en-US.png similarity index 100% rename from android/fastlane/metadata/android/en-US/images/tenInchScreenshots/3_en-US.png rename to fastlane/metadata/android/en-US/images/tenInchScreenshots/3_en-US.png diff --git a/android/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt similarity index 100% rename from android/fastlane/metadata/android/en-US/short_description.txt rename to fastlane/metadata/android/en-US/short_description.txt diff --git a/android/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt similarity index 100% rename from android/fastlane/metadata/android/en-US/title.txt rename to fastlane/metadata/android/en-US/title.txt diff --git a/android/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt similarity index 100% rename from android/fastlane/metadata/android/en-US/video.txt rename to fastlane/metadata/android/en-US/video.txt