Update SDK and build tools

microg · Nov 14, 2016 · 6662510 · 6662510
1 parent 62841ac
commit 6662510
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,15 +3,16 @@ sudo: false
 before_script:
   - echo sdk.dir $ANDROID_HOME > local.properties
 script:
+  - jdk_switcher use oraclejdk8
   - export TERM=dumb
   - export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
   - ./gradlew build
 android:
   components:
-    - platform-tools
     - tools
-    - build-tools-23.0.3
-    - android-23
+    - platform-tools
+    - build-tools-24.0.3
+    - android-24
     - extra-android-m2repository
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

diff --git a/build.gradle b/build.gradle
@@ -19,17 +19,21 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "23.0.3"
+    ext.androidBuildVersionTools = "24.0.3"
 }
 
-def androidCompileSdk() { return 23 }
+def androidCompileSdk() { return 24 }
+
+def androidTargetSdk() { return 24 }
+
+def androidMinSdk() { return 9 }
 
 subprojects {
     repositories {

diff --git a/unifiednlp-api/build.gradle b/unifiednlp-api/build.gradle
@@ -33,6 +33,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {

diff --git a/unifiednlp-api/src/main/AndroidManifest.xml b/unifiednlp-api/src/main/AndroidManifest.xml
@@ -17,8 +17,6 @@
 <manifest package="org.microg.nlp.api"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-sdk android:minSdkVersion="9"/>
-
     <application>
         <meta-data
             android:name="org.microg.nlp.API_VERSION"

diff --git a/unifiednlp-backend-sample/build.gradle b/unifiednlp-backend-sample/build.gradle
@@ -17,9 +17,10 @@
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 
@@ -30,6 +31,6 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 }
diff --git a/unifiednlp-backend-sample/src/main/AndroidManifest.xml b/unifiednlp-backend-sample/src/main/AndroidManifest.xml
@@ -22,8 +22,8 @@
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<uses-sdk
-		android:targetSdkVersion="19"
-		android:minSdkVersion="10" />
+		android:targetSdkVersion="24"
+		android:minSdkVersion="9" />
 	<application
 		android:allowBackup="false"
 		android:icon="@drawable/icon"