From a8e79631684ac81181253089d78b5922b10903ec Mon Sep 17 00:00:00 2001 From: Antonio Zugaldia Date: Tue, 12 Jun 2018 14:36:23 -0400 Subject: [android] Remove support for Fabric (#12126) * [android] remove fabric properties file * [android] fabric.properties no longer present * [android] fabric step in release.py no longer necessary --- platform/android/.gitignore | 3 --- .../fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties | 3 --- platform/android/scripts/release.py | 7 +------ 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties diff --git a/platform/android/.gitignore b/platform/android/.gitignore index 8cd5f26a89..f5affd93c7 100644 --- a/platform/android/.gitignore +++ b/platform/android/.gitignore @@ -21,9 +21,6 @@ gradle/configuration.gradle # Token file MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml -# Twitter Fabric / Crashlytics -fabric.properties - # Capture files captures/ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties deleted file mode 100644 index 716f0ffe70..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties +++ /dev/null @@ -1,3 +0,0 @@ -fabric-identifier=com.mapbox.mapboxsdk.mapbox-android-sdk -fabric-version=5.1.4 -fabric-build-type=binary diff --git a/platform/android/scripts/release.py b/platform/android/scripts/release.py index ce554d1362..d0abd1eeaf 100644 --- a/platform/android/scripts/release.py +++ b/platform/android/scripts/release.py @@ -59,8 +59,6 @@ ALLOWED_PRE_RELEASE = ['beta'] MAPBOX_GL_ANDROID_SDK_PATH = '../MapboxGLAndroidSDK' GRADLE_PROPERTIES_PATH = '%s/gradle.properties' % MAPBOX_GL_ANDROID_SDK_PATH GRADLE_TOKEN = 'VERSION_NAME=' -FABRIC_PROPERTIES_PATH = '%s/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties' % MAPBOX_GL_ANDROID_SDK_PATH -FABRIC_TOKEN = 'fabric-version=' # Triggers a new build, returns a summary of the build URL_CIRCLECI = 'https://circleci.com/api/v1.1/project/github/mapbox/mapbox-gl-native/tree/' # + :branch @@ -144,10 +142,7 @@ def publish_final(branch, version): dirty_gradle = update_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN, version=version) if dirty_gradle: git_add(path=GRADLE_PROPERTIES_PATH) - dirty_fabric = update_current_version(file_path=FABRIC_PROPERTIES_PATH, file_var=FABRIC_TOKEN, version=version) - if dirty_fabric: - git_add(path=FABRIC_PROPERTIES_PATH) - if dirty_gradle or dirty_fabric: + if dirty_gradle: git_commit_and_push(branch=branch, version=version) do_circleci_request(branch=branch) -- cgit v1.2.1