From d3d0532d1a91713a98ccab8344ad16b18027e1cb Mon Sep 17 00:00:00 2001 From: wagyu298 Date: Wed, 12 Dec 2018 10:13:17 +0900 Subject: [PATCH 1/2] Build settings upgraded for Android Studio 3.2.1 --- .../java/SafetyNetSample/Application/build.gradle | 12 ++++++------ client/java/SafetyNetSample/build.gradle | 14 +++++++------- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/java/SafetyNetSample/Application/build.gradle b/client/java/SafetyNetSample/Application/build.gradle index 28248f9..b184cb0 100644 --- a/client/java/SafetyNetSample/Application/build.gradle +++ b/client/java/SafetyNetSample/Application/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' dependencies { - compile "com.android.support:support-v4:$support_version" - compile "com.android.support:support-v13:$support_version" - compile "com.android.support:cardview-v7:$support_version" - compile "com.android.support:appcompat-v7:$support_version" - compile "com.google.android.gms:play-services-safetynet:$google_play_services_version" + implementation "com.android.support:support-v4:$support_version" + implementation "com.android.support:support-v13:$support_version" + implementation "com.android.support:cardview-v7:$support_version" + implementation "com.android.support:appcompat-v7:$support_version" + implementation "com.google.android.gms:play-services-safetynet:$google_play_services_version" } // The sample build uses multiple directories to @@ -18,7 +18,7 @@ List dirs = [ android { compileSdkVersion 26 - buildToolsVersion "$build_tools_version" + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.example.android.safetynetsample" diff --git a/client/java/SafetyNetSample/build.gradle b/client/java/SafetyNetSample/build.gradle index c461506..08a4d7c 100644 --- a/client/java/SafetyNetSample/build.gradle +++ b/client/java/SafetyNetSample/build.gradle @@ -1,21 +1,21 @@ buildscript { repositories { - maven { url 'https://maven.google.com' } + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.2.1' } - ext.build_tools_version = '25.0.3' - ext.support_version = '25.3.1' - ext.google_play_services_version = '11.0.1' + ext.build_tools_version = '28.0.3' + ext.support_version = '26.1.0' + ext.google_play_services_version = '16.0.0' allprojects { repositories { - maven { url 'https://maven.google.com' } + google() jcenter() } } -} \ No newline at end of file +} diff --git a/client/java/SafetyNetSample/gradle/wrapper/gradle-wrapper.properties b/client/java/SafetyNetSample/gradle/wrapper/gradle-wrapper.properties index 9984df5..75a5626 100644 --- a/client/java/SafetyNetSample/gradle/wrapper/gradle-wrapper.properties +++ b/client/java/SafetyNetSample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 09 16:53:43 AEST 2017 +#Wed Dec 12 09:55:42 JST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip From 444c376794a784ff09a544c91546268bb62cb599 Mon Sep 17 00:00:00 2001 From: wagyu298 Date: Wed, 12 Dec 2018 10:25:17 +0900 Subject: [PATCH 2/2] Restore to $ build_tools_version --- client/java/SafetyNetSample/Application/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/java/SafetyNetSample/Application/build.gradle b/client/java/SafetyNetSample/Application/build.gradle index b184cb0..abade9d 100644 --- a/client/java/SafetyNetSample/Application/build.gradle +++ b/client/java/SafetyNetSample/Application/build.gradle @@ -18,7 +18,7 @@ List dirs = [ android { compileSdkVersion 26 - buildToolsVersion '28.0.3' + buildToolsVersion "$build_tools_version" defaultConfig { applicationId "com.example.android.safetynetsample"