Skip to content

Commit da974d0

Browse files
committed
provide admob id
1 parent 5c783d6 commit da974d0

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/build-android.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,15 @@ jobs:
5050
- name: Build Release APK
5151
run: ./gradlew composeApp:assembleRelease
5252
env:
53+
ADMOB_APP_ID: ${{ secrets.ADMOB_APP_ID }}
5354
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
5455
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
5556
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
5657

5758
- name: Build Release AAB
5859
run: ./gradlew composeApp:bundleRelease
5960
env:
61+
ADMOB_APP_ID: ${{ secrets.ADMOB_APP_ID }}
6062
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
6163
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
6264
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}

composeApp/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,11 @@ private fun getAdmobAppId(): String? {
277277
props.load(it)
278278
}
279279
}.onSuccess {
280-
return props.getProperty("admob.app.id")?.ifBlank { null } ?: systemEnv("ADMOB_APP_ID")?.ifBlank { null }
280+
return props.getProperty("admob.app.id")?.ifBlank {
281+
null
282+
} ?: systemEnv("ADMOB_APP_ID")?.ifBlank { null }?.trim()
281283
}
282284
}
283285

284-
return systemEnv("ADMOB_APP_ID")?.ifBlank { null }
286+
return systemEnv("ADMOB_APP_ID")?.ifBlank { null }?.trim()
285287
}

0 commit comments

Comments
 (0)