Slight build simplification (#49)

* see if we can get a blind build to work in jitpack.io * simplify the build wrt local.properties
signalfx · Jun 23, 2021 · 1ec156c · 1ec156c
1 parent 68d2949
commit 1ec156c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -15,4 +15,4 @@ jobs:
           java-version: 11
 
       - name: Build and test
-        run: echo rum.beacon.url=http://backend > ./local.properties; echo rum.auth.token=abc123 >> ./local.properties; ./gradlew build --no-daemon
+        run: touch ./local.properties; ./gradlew build --no-daemon
diff --git a/sample-app/build.gradle b/sample-app/build.gradle
@@ -23,15 +23,12 @@ android {
     }
 
     buildTypes {
-        debug {
-            resValue("string", "rum_beacon_url", localProperties['rum.beacon.url'])
-            resValue("string", "rum_auth_token", localProperties['rum.auth.token'])
+        all {
+            resValue("string", "rum_beacon_url", localProperties['rum.beacon.url'] ?: "http://backend")
+            resValue("string", "rum_auth_token", localProperties['rum.auth.token'] ?: "dummyAuthToken")
         }
 
         release {
-            //TODO: is there a better way to put values in for these so the build doesn't fail?
-            resValue("string", "rum_beacon_url", "http://backend")
-            resValue("string", "rum_auth_token", "dummyAuthToken")
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }