From 906ee096fc9d542082904fb67b23fc7ceb4760c5 Mon Sep 17 00:00:00 2001 From: Roger Hu Date: Thu, 15 Nov 2018 15:56:45 -0800 Subject: [PATCH 1/2] Update Gradle --- SampleApplication/build.gradle | 4 +++- SampleApplication/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SampleApplication/build.gradle b/SampleApplication/build.gradle index 77ce66e..6e8474b 100644 --- a/SampleApplication/build.gradle +++ b/SampleApplication/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/SampleApplication/gradle/wrapper/gradle-wrapper.properties b/SampleApplication/gradle/wrapper/gradle-wrapper.properties index 1c39470..48ccacf 100644 --- a/SampleApplication/gradle/wrapper/gradle-wrapper.properties +++ b/SampleApplication/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Sep 21 10:57:50 CDT 2016 +#Thu Nov 15 15:50:16 PST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip From 756abee799b28e3efdb98092016e8defd1bb529f Mon Sep 17 00:00:00 2001 From: Roger Hu Date: Thu, 15 Nov 2018 16:03:00 -0800 Subject: [PATCH 2/2] Bump to Android P --- SampleApplication/app/build.gradle | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/SampleApplication/app/build.gradle b/SampleApplication/app/build.gradle index c4dad48..894b429 100644 --- a/SampleApplication/app/build.gradle +++ b/SampleApplication/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 28 defaultConfig { applicationId "com.bottlerocketstudios.vaultsampleapplication" minSdkVersion 17 - targetSdkVersion 23 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -29,6 +28,6 @@ repositories { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.bottlerocketstudios:vault:1.4.0-SNAPSHOT' + compile 'com.android.support:appcompat-v7:28.0.0' + compile 'com.bottlerocketstudios:vault:1.4.2' }