From 218a6ee9c99a2806f27dfefdb377324ec32ba8e3 Mon Sep 17 00:00:00 2001
From: Joseph Hale <me@jhale.dev>
Date: Fri, 5 May 2023 20:31:17 -0700
Subject: [PATCH] chore: Update .env names with platform prefixes

---
 android/app/build.gradle | 10 +++++-----
 fastlane/.env.dist       | 26 +++++++++++++-------------
 fastlane/Appfile         |  8 ++++----
 fastlane/Fastfile        |  6 +++---
 fastlane/Matchfile       |  2 +-
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6380bd2..30ea6e9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -119,11 +119,11 @@ android {
             keyPassword 'android'
         }
         release {
-            if (System.getenv("BINARY_CLOCK_UPLOAD_STORE_FILE").length() > 0) {
-                storeFile file(System.getenv("BINARY_CLOCK_UPLOAD_STORE_FILE"))
-                storePassword System.getenv("BINARY_CLOCK_UPLOAD_STORE_PASSWORD")
-                keyAlias System.getenv("BINARY_CLOCK_UPLOAD_KEY_ALIAS")
-                keyPassword System.getenv("BINARY_CLOCK_UPLOAD_KEY_PASSWORD")
+            if (System.getenv("ANDROID_RELEASE_KEYSTORE_FILE_PATH").length() > 0) {
+                storeFile file(System.getenv("ANDROID_RELEASE_KEYSTORE_FILE_PATH"))
+                storePassword System.getenv("ANDROID_RELEASE_KEYSTORE_PASSWORD")
+                keyAlias System.getenv("ANDROID_RELEASE_KEY_ALIAS")
+                keyPassword System.getenv("ANDROID_RELEASE_KEY_PASSWORD")
             }
         }
     }
diff --git a/fastlane/.env.dist b/fastlane/.env.dist
index e2615b1..7b51103 100644
--- a/fastlane/.env.dist
+++ b/fastlane/.env.dist
@@ -1,14 +1,14 @@
-BINARY_CLOCK_APPLE_ID="APPLE_ID"
-BINARY_CLOCK_ITC_TEAM_ID="ITC_TEAM_ID"
-BINARY_CLOCK_TEAM_ID="TEAM_ID"
-BINARY_CLOCK_CERTIFICATE_REPOSITORY_URL="CERTIFICATE_REPOSITORY_URL"
-MATCH_KEYCHAIN_PASSWORD="MATCH_KEYCHAIN_PASSWORD"
-APP_STORE_CONNECT_KEY_ID="KEY_ID"
-APP_STORE_CONNECT_ISSUER_ID="ISSUER_ID"
-APP_STORE_CONNECT_KEY_FILEPATH="KEY_FILEPATH"
+IOS_APPLE_ID="APPLE_ID"
+IOS_ITC_TEAM_ID="ITC_TEAM_ID"
+IOS_TEAM_ID="TEAM_ID"
+IOS_CERTIFICATE_REPOSITORY_URL="CERTIFICATE_REPOSITORY_URL"
+IOS_CERTIFICATE_KEYCHAIN_PASSWORD="IOS_CERTIFICATE_KEYCHAIN_PASSWORD"
+IOS_APP_STORE_CONNECT_KEY_ID="KEY_ID"
+IOS_APP_STORE_CONNECT_ISSUER_ID="ISSUER_ID"
+IOS_APP_STORE_CONNECT_KEY_FILEPATH="KEY_FILEPATH"
 
-BINARY_CLOCK_UPLOAD_STORE_FILE="BINARY_CLOCK_UPLOAD_STORE_FILE"
-BINARY_CLOCK_UPLOAD_KEY_ALIAS="BINARY_CLOCK_UPLOAD_KEY_ALIAS"
-BINARY_CLOCK_UPLOAD_STORE_PASSWORD="BINARY_CLOCK_UPLOAD_STORE_PASSWORD"
-BINARY_CLOCK_UPLOAD_KEY_PASSWORD="BINARY_CLOCK_UPLOAD_KEY_PASSWORD"
-JSON_KEY_FILE_PATH="JSON_KEY_FILE_PATH"
+ANDROID_RELEASE_KEYSTORE_FILE_PATH="ANDROID_RELEASE_KEYSTORE_FILE_PATH"
+ANDROID_RELEASE_KEYSTORE_PASSWORD="ANDROID_RELEASE_KEYSTORE_PASSWORD"
+ANDROID_RELEASE_KEY_ALIAS="ANDROID_RELEASE_KEY_ALIAS"
+ANDROID_RELEASE_KEY_PASSWORD="ANDROID_RELEASE_KEY_PASSWORD"
+ANDROID_GOOGLE_PLAY_JSON_KEY_FILE_PATH="ANDROID_GOOGLE_PLAY_JSON_KEY_FILE_PATH"
diff --git a/fastlane/Appfile b/fastlane/Appfile
index 2001322..8328e06 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,12 +1,12 @@
 # iOS
 app_identifier("dev.jhale.BinaryClock") # The bundle identifier of your app
-apple_id(ENV["BINARY_CLOCK_APPLE_ID"]) # Your Apple Developer Portal username
+apple_id(ENV["IOS_APPLE_ID"]) # Your Apple Developer Portal username
 
-itc_team_id(ENV["BINARY_CLOCK_ITC_TEAM_ID"]) # App Store Connect Team ID
-team_id(ENV["BINARY_CLOCK_TEAM_ID"]) # Developer Portal Team ID
+itc_team_id(ENV["IOS_ITC_TEAM_ID"]) # App Store Connect Team ID
+team_id(ENV["IOS_TEAM_ID"]) # Developer Portal Team ID
 
 # Android
-json_key_file(ENV["JSON_KEY_FILE_PATH"]) # Google Play Console Credentials
+json_key_file(ENV["ANDROID_GOOGLE_PLAY_JSON_KEY_FILE_PATH"]) # Google Play Console Credentials
 package_name("dev.jhale.binaryclock") # Google Play App Identifier
 
 # For more information about the Appfile, see:
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 926a046..e3b0897 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -36,9 +36,9 @@ platform :ios do
   lane :beta do
     build
     app_store_connect_api_key(
-      key_id: ENV["APP_STORE_CONNECT_KEY_ID"],
-      issuer_id: ENV["APP_STORE_CONNECT_ISSUER_ID"],
-      key_filepath: ENV["APP_STORE_CONNECT_KEY_FILEPATH"],
+      key_id: ENV["IOS_APP_STORE_CONNECT_KEY_ID"],
+      issuer_id: ENV["IOS_APP_STORE_CONNECT_ISSUER_ID"],
+      key_filepath: ENV["IOS_APP_STORE_CONNECT_KEY_FILEPATH"],
     )
     pilot
   end
diff --git a/fastlane/Matchfile b/fastlane/Matchfile
index a658e1b..1bc3301 100644
--- a/fastlane/Matchfile
+++ b/fastlane/Matchfile
@@ -1,4 +1,4 @@
-git_url(ENV['BINARY_CLOCK_CERTIFICATE_REPOSITORY_URL'])
+git_url(ENV['IOS_CERTIFICATE_REPOSITORY_URL'])
 
 storage_mode("git")
 
-- 
2.51.2