From 58890014654737d36c0d053f75349ad8efdaf7f6 Mon Sep 17 00:00:00 2001 From: Norman Breau Date: Tue, 7 Jan 2020 11:47:27 -0400 Subject: [PATCH] Increased default target sdk to 29 (#848) * (android) increased default target sdk to 29 * Updated travis and appveyor to use build tools/api level 29 * Fixed two other files that was missing the API 29 update --- .travis.yml | 4 ++-- appveyor.yml | 2 +- bin/templates/project/build.gradle | 6 +++--- framework/project.properties | 2 +- spec/fixtures/android_studio_project/app/build.gradle | 6 +++--- test/app/build.gradle | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 543dc5f0..55dea8cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ dist: trusty env: global: - - ANDROID_API_LEVEL=28 - - ANDROID_BUILD_TOOLS_VERSION=28.0.3 + - ANDROID_API_LEVEL=29 + - ANDROID_BUILD_TOOLS_VERSION=29.0.2 - TERM=dumb # Keep gradle from crapping all over the log matrix: - nodejs_version=10 diff --git a/appveyor.yml b/appveyor.yml index aaaf1d89..ca7918c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ install: - set PATH=%PATH%;"%ANDROID_HOME%\tools\bin" - yes 2> nul | sdkmanager --licenses > nul - - sdkmanager "build-tools;28.0.3" + - sdkmanager "build-tools;29.0.2" - choco install gradle --version 3.4.1 diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle index bea8a746..411e1a44 100644 --- a/bin/templates/project/build.gradle +++ b/bin/templates/project/build.gradle @@ -40,10 +40,10 @@ allprojects { //This replaces project.properties w.r.t. build settings project.ext { - defaultBuildToolsVersion="28.0.3" //String + defaultBuildToolsVersion="29.0.2" //String defaultMinSdkVersion=19 //Integer - Minimum requirement is Android 4.4 - defaultTargetSdkVersion=28 //Integer - We ALWAYS target the latest by default - defaultCompileSdkVersion=28 //Integer - We ALWAYS compile with the latest by default + defaultTargetSdkVersion=29 //Integer - We ALWAYS target the latest by default + defaultCompileSdkVersion=29 //Integer - We ALWAYS compile with the latest by default } } diff --git a/framework/project.properties b/framework/project.properties index cbb644c7..d0519174 100644 --- a/framework/project.properties +++ b/framework/project.properties @@ -5,7 +5,7 @@ split.density=false # Project target. -target=android-28 +target=android-29 apk-configurations= renderscript.opt.level=O0 android.library=true diff --git a/spec/fixtures/android_studio_project/app/build.gradle b/spec/fixtures/android_studio_project/app/build.gradle index c5be1506..25935a2e 100644 --- a/spec/fixtures/android_studio_project/app/build.gradle +++ b/spec/fixtures/android_studio_project/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { applicationId "com.example.anis.myapplication" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" } diff --git a/test/app/build.gradle b/test/app/build.gradle index 7c43f847..33eb937d 100644 --- a/test/app/build.gradle +++ b/test/app/build.gradle @@ -19,13 +19,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { applicationId "org.apache.cordova.unittests" minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"