From 08a978b3722d583058df5e80a4876df1f5710b1d Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Sat, 23 Jun 2018 10:30:05 +0200 Subject: [PATCH] Update compileSdkVersion --- .travis.yml | 8 ++++---- android/app/build.gradle | 12 ++++++------ android/build.gradle | 11 +++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24aea67..b1e7866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ android: components: - tools - platform-tools - - build-tools-23.0.1 - - android-23 + - build-tools-27.0.3 + - android-27 - extra-google-m2repository - extra-android-m2repository licenses: @@ -27,7 +27,7 @@ android: - google-gdk-license-.+ before_install: -- yes | sdkmanager "platforms;android-26" +- yes | sdkmanager "platforms;android-27" - nvm install 8 - node --version - openssl aes-256-cbc -K $encrypted_f6e0f94759d3_key -iv $encrypted_f6e0f94759d3_iv @@ -45,7 +45,7 @@ before_deploy: - jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $HOME/gotify-release-key.jks -storepass $STOREPASS -keypass $KEYPASS app-release-unsigned.apk gotify-release-key - jarsigner -verify app-release-unsigned.apk -- "${ANDROID_HOME}/build-tools/23.0.1/zipalign -v 4 app-release-unsigned.apk Gotify.apk" +- "${ANDROID_HOME}/build-tools/27.0.3/zipalign -v 4 app-release-unsigned.apk Gotify.apk" deploy: provider: releases diff --git a/android/app/build.gradle b/android/app/build.gradle index 16f5d1e..44c1b7d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -102,15 +102,15 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 23 - buildToolsVersion '23.0.1' + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId "de.gotify" minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 27 versionCode 1 - versionName "1.0" + versionName "1.0.0" ndk { abiFilters "armeabi-v7a", "x86" } @@ -149,10 +149,10 @@ dependencies { compile project(':react-native-device-info') compile project(':react-native-vector-icons') compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:23.0.1' + compile 'com.android.support:appcompat-v7:27.1.1' compile 'com.squareup.okhttp3:okhttp:3.9.1' compile 'com.google.code.gson:gson:2.8.4' - compile 'com.facebook.react:react-native:+' + compile 'com.facebook.react:react-native:0.55.3' // From node_modules } diff --git a/android/build.gradle b/android/build.gradle index 82be681..2387053 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,6 +27,11 @@ allprojects { } +ext { + compileSdkVersion = 27 + buildToolsVersion = '27.0.3' +} + subprojects { afterEvaluate { android { @@ -34,5 +39,11 @@ subprojects { abortOnError false } } + if (project.plugins.hasPlugin('android') || project.plugins.hasPlugin('android-library')) { + android { + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion + } + } } } \ No newline at end of file