Merge branch '2169-multiple-signing-conf' into 'master'

2169 multiple signing conf

Closes e/backlog#2169

See merge request e/apps/GmsCore!26

.gitlab-ci.yml

@@ -26,26 +26,38 @@ cache:
 
 build:
   stage: build
-  script:
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
+      when: never
+    - when: always
+  before_script:
   - echo sdk.dir $ANDROID_HOME > local.properties
   - echo mapbox.key $MAPBOX_KEY >> local.properties
   - echo mapbox.enabled true >> local.properties
+  - echo "${KEYSTORE}" | base64 -d > play-services-core/e.keystore
   - export TERM=dumb
   - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx4096m"
+  script:
+  - ./gradlew assembleDebug
   - ./gradlew assembleRelease
   artifacts:
     paths:
     - play-services-core/build/outputs/apk/
 
+build-release:
+  extends: build
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
+  script:
+  - ./gradlew assemble
+
 publish:
   stage: publish
-  only:
-    - tags                                       # Run only on tags
-  except:
-    - branches                                   # Do not run this job on a branch
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
   script:
     - |
       curl --fail --output "/dev/null" --silent --show-error \
            --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: ${PUBLICATION_TOKEN}" \
-           --data "{\"ref\" : \"${CI_COMMIT_SHA}\",\"name\": \"${CI_COMMIT_TAG}\", \"tag_name\": \"${CI_COMMIT_TAG}\", \"description\": \"${CI_COMMIT_TITLE}\", \"assets\": {\"links\": [{\"name\": \"GMSCore.apk\", \"url\": \"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/release/play-services-core-withMapbox-withNearby-release-unsigned.apk?job=build\", \"filepath\": \"/play-services-core/build/outputs/apk/withMapboxWithNearby/release/play-services-core-withMapbox-withNearby-release-unsigned.apk\", \"link_type\":\"other\" }] } }" \
+           --data "{\"ref\":\"${CI_COMMIT_SHA}\",\"name\":\"${CI_COMMIT_TAG}\",\"tag_name\":\"${CI_COMMIT_TAG}\",\"description\":\"${CI_COMMIT_TITLE}\",\"assets\":{\"links\":[{\"name\":\"GmsCore-test.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseTest/play-services-core-withMapbox-withNearby-releaseTest.apk?job=build-release\",\"link_type\":\"package\"},{\"name\":\"GmsCore-dev.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseDev/play-services-core-withMapbox-withNearby-releaseDev.apk?job=build-release\",\"link_type\":\"package\"},{\"name\":\"GmsCore-stable.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseStable/play-services-core-withMapbox-withNearby-releaseStable.apk?job=build-release\",\"link_type\":\"package\"}]}}" \
            --request POST https://gitlab.e.foundation/api/v4/projects/149/releases

firebase-auth-api/build.gradle

@@ -19,6 +19,16 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

firebase-auth-core/build.gradle

@@ -43,4 +43,14 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }

firebase-dynamic-links-api/build.gradle

@@ -42,6 +42,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-api/build.gradle

@@ -30,6 +30,16 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-appinvite-api/build.gradle

@@ -42,6 +42,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-base-api/build.gradle

@@ -37,4 +37,14 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }

play-services-base-core-ui/build.gradle

@@ -55,4 +55,14 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }

play-services-base-core/build.gradle

@@ -26,4 +26,14 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }

play-services-base/build.gradle

@@ -30,6 +30,16 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-basement/build.gradle

@@ -48,4 +48,14 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }

play-services-cast-api/build.gradle

@@ -33,6 +33,16 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-cast-framework-api/build.gradle

@@ -30,6 +30,16 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-cast/build.gradle

@@ -39,6 +39,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-core/build.gradle

@@ -120,20 +120,55 @@ android {
     }
 
     signingConfigs {
-        release {
-            storeFile file("platform.keystore")
-            storePassword 'password'
-            keyAlias 'platform'
-            keyPassword 'password'
+
+        def keystore_password = System.getenv('KEYSTORE_PASSWORD')
+
+        releaseTest {
+            storeFile file("e.keystore")
+            storePassword keystore_password
+            keyAlias 'platform.test'
+            keyPassword keystore_password
+        }
+
+        releaseDev {
+            storeFile file("e.keystore")
+            storePassword keystore_password
+            keyAlias 'platform.dev'
+            keyPassword keystore_password
+        }
+
+        releaseStable {
+            storeFile file("e.keystore")
+            storePassword keystore_password
+            keyAlias 'platform.stable'
+            keyPassword keystore_password
         }
     }
 
 
     buildTypes {
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+        }
+
+        releaseTest {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.releaseTest
+        }
+
+        releaseDev {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.releaseDev
+        }
+
+        releaseStable {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.releaseStable
         }
     }
 

play-services-core/microg-ui-tools/build.gradle

@@ -35,10 +35,19 @@ android {
         // TODO: Remove MissingTranslation once we have stable strings and proper translations.
         disable 'MissingTranslation'
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation "androidx.preference:preference:$preferenceVersion"
 }
-

play-services-gcm/build.gradle

@@ -39,6 +39,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-iid-api/build.gradle

@@ -30,6 +30,16 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {

play-services-iid/build.gradle

@@ -39,6 +39,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildTypes {
+        release {}
+
+        releaseTest {}
+
+        releaseDev {}
+
+        releaseStable {}
+    }
 }
 
 dependencies {