Read API keys from gradle.properties file

moallemi · Jul 13, 2024 · 84ad3eb · 84ad3eb
1 parent 3983b65
commit 84ad3eb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,6 +14,8 @@ jobs:
 
  env:
  ORG_GRADLE_PROJECT_FILM_TIME_TMDB_API_KEY: ${{ secrets.FILM_TIME_TMDB_API_KEY }}
+ ORG_GRADLE_PROJECT_FILM_TIME_TRAKT_CLIENT_ID: ${{ secrets.FILM_TIME_TRAKT_CLIENT_ID }}
+ ORG_GRADLE_PROJECT_FILM_TIME_TRAKT_CLIENT_SECRET: ${{ secrets.FILM_TIME_TRAKT_CLIENT_SECRET }}
  ORG_GRADLE_PROJECT_FILM_TIME_RELEASE_KEYSTORE_PASSWORD: ${{ secrets.FILM_TIME_RELEASE_KEYSTORE_PASSWORD }}
  ORG_GRADLE_PROJECT_FILM_TIME_RELEASE_KEY_PASSWORD: ${{ secrets.FILM_TIME_RELEASE_KEY_PASSWORD }}
 

diff --git a/.github/workflows/publish-google-play.yml b/.github/workflows/publish-google-play.yml
@@ -12,6 +12,8 @@ jobs:
 
  env:
  ORG_GRADLE_PROJECT_FILM_TIME_TMDB_API_KEY: ${{ secrets.FILM_TIME_TMDB_API_KEY }}
+ ORG_GRADLE_PROJECT_FILM_TIME_TRAKT_CLIENT_ID: ${{ secrets.FILM_TIME_TRAKT_CLIENT_ID }}
+ ORG_GRADLE_PROJECT_FILM_TIME_TRAKT_CLIENT_SECRET: ${{ secrets.FILM_TIME_TRAKT_CLIENT_SECRET }}
  ORG_GRADLE_PROJECT_FILM_TIME_RELEASE_KEYSTORE_PASSWORD: ${{ secrets.FILM_TIME_RELEASE_KEYSTORE_PASSWORD }}
  ORG_GRADLE_PROJECT_FILM_TIME_RELEASE_KEY_PASSWORD: ${{ secrets.FILM_TIME_RELEASE_KEY_PASSWORD }}
 

diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ app uses:
 
 You can find information about how to gain access [here](docs/API-Keys.md).
 
-Add this to your system environment variables:
+Add this to your `~/.gradle/gradle.properties` file:
 
 ```shell
 # Get this from TMDb

diff --git a/data/network/build.gradle.kts b/data/network/build.gradle.kts
@@ -7,9 +7,9 @@ android {
  namespace = "io.filmtime.data.network"
 
  defaultConfig {
- buildConfigField("String", "TMDB_API_KEY", "\"${System.getenv("FILM_TIME_TMDB_API_KEY")}\"")
- buildConfigField("String", "TRAKT_CLIENT_ID", "\"${System.getenv("FILM_TIME_TRAKT_CLIENT_ID")}\"")
- buildConfigField("String", "TRAKT_CLIENT_SECRET", "\"${System.getenv("FILM_TIME_TRAKT_CLIENT_SECRET")}\"")
+ buildConfigField("String", "TMDB_API_KEY", "\"${project.properties["FILM_TIME_TMDB_API_KEY"]}\"")
+ buildConfigField("String", "TRAKT_CLIENT_ID", "\"${project.properties["FILM_TIME_TRAKT_CLIENT_ID"]}\"")
+ buildConfigField("String", "TRAKT_CLIENT_SECRET", "\"${project.properties["FILM_TIME_TRAKT_CLIENT_SECRET"]}\"")
  }
 
  buildFeatures {

diff --git a/feature/trakt-login/build.gradle.kts b/feature/trakt-login/build.gradle.kts
@@ -7,7 +7,7 @@ android {
  namespace = "io.filmtime.feature.trakt.login"
 
  defaultConfig {
- buildConfigField("String", "TRAKT_CLIENT_ID", "\"${System.getenv("FILM_TIME_TRAKT_CLIENT_ID")}\"")
+ buildConfigField("String", "TRAKT_CLIENT_ID", "\"${project.properties["FILM_TIME_TRAKT_CLIENT_ID"]}\"")
 
  buildFeatures {
  buildConfig = true