Merge branch 'develop'

.gitlab-ci.yml

@@ -3,14 +3,15 @@ before_script:
   - export TERM=dumb
   - export _JAVA_OPTIONS="-Djava.awt.headless=true"
   - apt-get -q -y update
-  - apt-get -q -y install wget tar openjdk-7-jdk lib32stdc++6 lib32z1
+  - apt-get -q -y install wget tar expect openjdk-7-jdk lib32stdc++6 lib32z1
   - wget -q http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
   - tar xzf android-sdk_r24.4.1-linux.tgz
-  - echo y | android-sdk-linux/tools/android -s update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.2,android-23,extra-android-m2repository
+  - wget -q https://raw.githubusercontent.com/journeyapps/android-sdk-installer/master/accept-licenses
+  - chmod +x accept-licenses
+  - ./accept-licenses "android-sdk-linux/tools/android -s update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.2,android-23,extra-android-m2repository" "android-sdk-license-5be876d5|android-sdk-license-ed0d0a5b"
   - export ANDROID_HOME=$PWD/android-sdk-linux
-  - printf "GITLAB_FABRIC_KEY = \"\"\n" > gradle.properties
   - chmod +x gradlew
 build:
   script:
-    - ./gradlew build -x fabricGenerateResourcesRelease -x crashlyticsStoreDeobsRelease -x crashlyticsUploadDeobsRelease --stacktrace
+    - ./gradlew build -x fabricGenerateResourcesRelease --stacktrace

.magnum.yml

@@ -6,10 +6,11 @@ before_script:
   - sudo apt-get -q -y install wget tar openjdk-7-jdk lib32stdc++6 lib32z1
   - wget -q http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
   - tar xzf android-sdk_r24.4.1-linux.tgz
-  - echo y | android-sdk-linux/tools/android -s update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.2,android-23,extra-android-m2repository
+  - wget -q https://raw.githubusercontent.com/journeyapps/android-sdk-installer/master/accept-licenses
+  - chmod +x accept-licenses
+  - ./accept-licenses "android-sdk-linux/tools/android -s update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.2,android-23,extra-android-m2repository" "android-sdk-license-5be876d5|android-sdk-license-ed0d0a5b"
   - export ANDROID_HOME=$PWD/android-sdk-linux
-  - printf "GITLAB_FABRIC_KEY = \"\"\n" > gradle.properties
   - chmod +x gradlew
 script:
-  - ./gradlew build -x fabricGenerateResourcesRelease -x crashlyticsStoreDeobsRelease -x crashlyticsUploadDeobsRelease --stacktrace
+  - ./gradlew build -x fabricGenerateResourcesRelease --stacktrace

.travis.yml

@@ -11,4 +11,4 @@ before_script:
     - printf "GITLAB_FABRIC_KEY = \"\"\n" > gradle.properties
     - chmod +x gradlew
-script: "./gradlew build -x fabricGenerateResourcesRelease -x crashlyticsStoreDeobsRelease -x crashlyticsUploadDeobsRelease --stacktrace"
+script: "./gradlew build -x fabricGenerateResourcesRelease --stacktrace"