[ci] Add sdk registry plugin integration. (#479)

* [ci] Add sdk registry plugin integration. * Update ci image. * Test upload to staging bucket. * Remove staging upload test.
mapbox · Jul 23, 2020 · 8a0acf6 · 8a0acf6
1 parent 40c7342
commit 8a0acf6
Show file tree

Hide file tree

Showing 12 changed files with 216 additions and 78 deletions.
diff --git a/Makefile b/Makefile
@@ -246,15 +246,10 @@ android-ui-test: gradle/configuration.gradle
 run-android-test-app-center:
 	appcenter test run espresso --app "Mapbox-mobile/Maps-sdk" --devices "Mapbox-mobile/${devices}" --app-path MapboxGLAndroidSDKTestApp/build/outputs/apk/debug/MapboxGLAndroidSDKTestApp-debug.apk  --test-series "master" --locale "en_US" --build-dir MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/debug --token ${APPCENTER_ACCESS_TOKEN}
 
-# Uploads the compiled Android SDK to Bintray
-.PHONY: run-android-upload-to-bintray
-run-android-upload-to-bintray: gradle/configuration.gradle
-	$(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all :MapboxGLAndroidSDK:bintrayUpload
-
-# Uploads the compiled Android SDK SNAPSHOT to oss.jfrog.org
-.PHONY: run-android-upload-to-artifactory
-run-android-upload-to-artifactory: gradle/configuration.gradle
-	$(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all :MapboxGLAndroidSDK:artifactoryPublish
+# Uploads the compiled Android SDK to Mapbox SDK Registry
+.PHONY: run-android-upload-to-sdk-registry
+run-android-upload-to-sdk-registry: gradle/configuration.gradle
+	$(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all :MapboxGLAndroidSDK:mapboxSDKRegistryUpload
 
 # Dump system graphics information for the test app
 .PHONY: android-gfxinfo

diff --git a/MapboxGLAndroidSDK/build.gradle b/MapboxGLAndroidSDK/build.gradle
@@ -96,5 +96,5 @@ apply from: "${projectDir}/../gradle/gradle-checkstyle.gradle"
 apply from: "${projectDir}/../gradle/gradle-dependencies-graph.gradle"
 apply from: "${projectDir}/../gradle/gradle-update-vendor-modules.gradle"
 apply from: "${projectDir}/../gradle/android-nitpick.gradle"
-apply from: "${projectDir}/../gradle/gradle-bintray.gradle"
+apply from: "${projectDir}/../gradle/gradle-sdk-registry.gradle"
 apply from: "${projectDir}/../gradle/jacoco-report.gradle"
diff --git a/MapboxGLAndroidSDK/gradle.properties b/MapboxGLAndroidSDK/gradle.properties
@@ -3,7 +3,3 @@ VERSION_NAME=9.3.0-SNAPSHOT
 # Only build native dependencies for the current ABI
 # See https://code.google.com/p/android/issues/detail?id=221098#c20
 android.buildOnlyTargetAbi=true
-
-# Roboelectric 4.0 required config for < Android Studio v3.3.0
-# http://robolectric.org/migrating/#migrating-to-40
-android.enableUnitTestBinaryResources=true
diff --git a/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk b/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk
@@ -1,2 +1,2 @@
-MapboxGLAndroidSDK/9.1.0-SNAPSHOT
+MapboxGLAndroidSDK/9.3.0-SNAPSHOT
 v-1
diff --git a/build.gradle b/build.gradle
@@ -4,16 +4,25 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven {
+            url 'https://api.mapbox.com/downloads/v2/releases/maven'
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                username "mapbox"
+                password = project.hasProperty('SDK_REGISTRY_TOKEN') ? project.property('SDK_REGISTRY_TOKEN') : System.getenv('SDK_REGISTRY_TOKEN')
+            }
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath dependenciesList.licensesPlugin
         classpath dependenciesList.kotlinPlugin
-        classpath dependenciesList.bintrayPlugin
-        classpath dependenciesList.artifactoryPlugin
         classpath dependenciesList.androidPublishPlugin
         classpath dependenciesList.jacocoPlugin
         classpath dependenciesList.mapboxSdkVersions
+        classpath dependenciesList.mapboxSdkRegistryPlugin
     }
 }
 
@@ -22,7 +31,6 @@ allprojects {
         mavenCentral()
         google()
         jcenter()
-
         maven {
             url 'https://api.mapbox.com/downloads/v2/releases/maven'
             authentication {

diff --git a/circle.yml b/circle.yml
@@ -190,7 +190,7 @@ jobs:
         default: "c++_static"
       image:
         type: string
-        default: android-ndk-r21b:a111a5b966
+        default: android-ndk-r21:769c31f1d8
       firebase_device_id:
         type: string
         default: sailfish
@@ -267,7 +267,7 @@ jobs:
   # ------------------------------------------------------------------------------
   android-release:
     docker:
-      - image: mbgl/android-ndk-r21b:a111a5b966
+      - image: mbgl/android-ndk-r21:769c31f1d8
     resource_class: xlarge
     working_directory: /src
     environment:
@@ -318,11 +318,10 @@ jobs:
       - store_artifacts:
           path: MapboxGLAndroidSDKTestApp/build/outputs/apk/release
           destination: .
-      - run:
-          name: upload debuggable objects to release tag
+      - deploy:
+          name: Publish to SDK Registry
           command: |
             if [[ $CIRCLE_TAG == android-v* ]]; then
-              export GITHUB_TOKEN=${DANGER_GITHUB_API_TOKEN}
-              python3 scripts/upload-to-github-release.py --file MapboxGLAndroidSDK/build/intermediates/cmake/release/debuggable-objects.tar.gz --release $CIRCLE_TAG --project mapbox-gl-native-android
+              make run-android-upload-to-sdk-registry
             fi
       - generate-api-javadoc
diff --git a/cloudformation/ci.template.js b/cloudformation/ci.template.js
@@ -0,0 +1,47 @@
+var cf = require('@mapbox/cloudfriend');
+
+module.exports = {
+AWSTemplateFormatVersion: '2010-09-09',
+  Resources: {
+    User: {
+      Type: 'AWS::IAM::User',
+      Properties: {
+        Policies: [
+          {
+            PolicyName: 'upload-sdk-registry',
+            PolicyDocument: {
+              Statement: [
+                {
+                  Action: ['s3:ListBucket'],
+                  Effect: 'Allow',
+                  Resource: [
+                    'arn:aws:s3:::mapbox-api-downloads-production',
+                    'arn:aws:s3:::mapbox-api-downloads-staging'
+                  ]
+                },
+                {
+                  Action: ['s3:PutObject'],
+                  Effect: 'Allow',
+                  Resource: [
+                    'arn:aws:s3:::mapbox-api-downloads-production/v2/*',
+                    'arn:aws:s3:::mapbox-api-downloads-staging/v2/*'
+                  ]
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
+    AccessKey: {
+      Type: 'AWS::IAM::AccessKey',
+      Properties: {
+        UserName: cf.ref('User')
+      }
+    }
+  },
+  Outputs: {
+    AccessKeyId: { Value: cf.ref('AccessKey') },
+    SecretAccessKey: { Value: cf.getAtt('AccessKey', 'SecretAccessKey') }
+  }
+};
diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle
@@ -11,11 +11,4 @@ ext {
     mapboxArtifactLicenseName = 'BSD'
     mapboxArtifactLicenseUrl = 'https://opensource.org/licenses/BSD-2-Clause'
     versionName = project.hasProperty('VERSION_NAME') ? project.property('VERSION_NAME') : System.getenv('VERSION_NAME')
-
-    mapboxBintrayUserOrg = 'mapbox'
-    mapboxBintrayRepoName = 'mapbox'
-    mapboxBintrayPackageName = 'com.mapbox.mapboxsdk:mapbox-android-sdk'
-    mapboxBintrayUser = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    mapboxBintrayApiKey = project.hasProperty('BINTRAY_API_KEY') ? project.property('BINTRAY_API_KEY') : System.getenv('BINTRAY_API_KEY')
-    mapboxGpgPassphrase = project.hasProperty('GPG_PASSPHRASE') ? project.property('GPG_PASSPHRASE') : System.getenv('GPG_PASSPHRASE')
 }
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -39,8 +39,9 @@ ext {
             appcenter        : '1.4',
             ktlint           : '0.34.0',
             commonsIO        : '2.6',
-            mapboxSdkVersions: '1.0.1',
-            mapboxSdkCore    : '1.8.3'
+            mapboxSdkVersions: '1.1.0',
+            mapboxSdkCore    : '1.8.3',
+            mapboxSdkRegistryPlugin: '0.2.1'
     ]
 
     dependenciesList = [
@@ -50,6 +51,8 @@ ext {
             mapboxAndroidGestures  : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}",
             mapboxAndroidAccounts  : "com.mapbox.mapboxsdk:mapbox-android-accounts:${versions.mapboxAccounts}",
             mapboxJavaTurf         : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}",
+            mapboxSdkVersions      : "com.mapbox.mapboxsdk:mapbox-android-sdk-versions:${versions.mapboxSdkVersions}",
+            mapboxSdkRegistryPlugin: "com.mapbox.gradle.plugins:sdk-registry:${versions.mapboxSdkRegistryPlugin}",
 
             junit                  : "junit:junit:${versions.junit}",
             mockito                : "org.mockito:mockito-core:${versions.mockito}",
@@ -89,7 +92,6 @@ ext {
             lintApi                : "com.android.tools.lint:lint-api:${versions.lint}",
             lintChecks             : "com.android.tools.lint:lint-checks:${versions.lint}",
             lintTests              : "com.android.tools.lint:lint-tests:${versions.lint}",
-            ktlint                 : "com.pinterest:ktlint:${versions.ktlint}",
-            mapboxSdkVersions      : "com.mapbox.mapboxsdk:mapbox-android-sdk-versions:${versions.mapboxSdkVersions}"
+            ktlint                 : "com.pinterest:ktlint:${versions.ktlint}"
     ]
 }
diff --git a/gradle/gradle-bintray.gradle → gradle/gradle-sdk-registry.gradle b/gradle/gradle-bintray.gradle → gradle/gradle-sdk-registry.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'digital.wup.android-maven-publish'
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
-apply plugin: 'com.jfrog.artifactory'
+apply plugin: 'com.mapbox.sdkRegistry'
 apply from: file('../gradle/artifact-settings.gradle')
 
 version = project.ext.versionName
 group = project.ext.mapboxArtifactGroupId
 
 publishing {
     publications {
-        MapboxMapsSdkPublication(MavenPublication) {
+        MapboxAndroidMapsSdk(MavenPublication) {
             from components.android
             groupId this.group
             artifactId project.ext.mapboxArtifactId
@@ -44,44 +43,13 @@ publishing {
     }
 }
 
-bintray {
-    user = mapboxBintrayUser
-    key = mapboxBintrayApiKey
-    publications('MapboxMapsSdkPublication')
-    pkg {
-        repo = project.ext.mapboxBintrayRepoName
-        name = project.ext.mapboxBintrayPackageName
-        userOrg = project.ext.mapboxBintrayUserOrg
-        licenses = [project.ext.mapboxArtifactLicenseName]
-        vcsUrl = project.ext.mapboxArtifactVcsUrl
-        publish = false
-        version {
-            name = project.ext.versionName
-            desc = project.ext.mapboxArtifactDescription
-            released = new Date()
-            gpg {
-                sign = true
-                passphrase = mapboxGpgPassphrase
-            }
-            mavenCentralSync {
-                sync = false
-            }
-        }
-    }
-}
-
-artifactory {
-    contextUrl = 'http://oss.jfrog.org'
-    publish {
-        repository {
-            repoKey = 'oss-snapshot-local'
-            username = mapboxBintrayUser
-            password = mapboxBintrayApiKey
-        }
-        defaults {
-            publications('MapboxMapsSdkPublication')
-        }
-    }
+registry {
+    sdkName = "mobile-maps"
+    production = true
+    snapshot = false
+    override = false
+    dryRun = false
+    publications = ["MapboxAndroidMapsSdk"]
 }
 
 task androidJavadocs(type: Javadoc) {