From d09c84c088275149b1fd7fd81c55802ababddc3c Mon Sep 17 00:00:00 2001 From: Rafael Ortega <> Date: Tue, 8 Oct 2019 14:38:33 +0200 Subject: [PATCH 1/3] raise min and target versions --- build.gradle | 10 +++++++++- dsbridge/build.gradle | 16 ++++++++-------- .../src/main/java/wendu/dsbridge/DWebView.java | 1 - 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index eecd4af..6bff4e0 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:3.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +18,10 @@ buildscript { allprojects { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } } task clean(type: Delete) { diff --git a/dsbridge/build.gradle b/dsbridge/build.gradle index bd2ce23..40cac8c 100644 --- a/dsbridge/build.gradle +++ b/dsbridge/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion '25.0.0' + compileSdkVersion 28 + buildToolsVersion '25.0.3' defaultConfig { - minSdkVersion 11 - targetSdkVersion 23 + minSdkVersion 14 + targetSdkVersion 28 versionCode 1 versionName "1.0" @@ -25,10 +25,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:23.4.0' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:28.0.0' + testImplementation 'junit:junit:4.12' } diff --git a/dsbridge/src/main/java/wendu/dsbridge/DWebView.java b/dsbridge/src/main/java/wendu/dsbridge/DWebView.java index 26fb9c8..9172d72 100644 --- a/dsbridge/src/main/java/wendu/dsbridge/DWebView.java +++ b/dsbridge/src/main/java/wendu/dsbridge/DWebView.java @@ -3,7 +3,6 @@ import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; -//import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; From 8d6fe413db95ad033293e1ad5fbaf7d2ce9cfd04 Mon Sep 17 00:00:00 2001 From: Rafael Ortega <> Date: Tue, 8 Oct 2019 15:19:39 +0200 Subject: [PATCH 2/3] update gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c01f703..0879b8e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ -#Sat Aug 19 10:25:16 CST 2017 - +#Tue Oct 08 15:14:52 CEST 2019 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-5.4.1-all.zip From 0109bf9492d76379c53523db9c5ec1fd779f2f19 Mon Sep 17 00:00:00 2001 From: Rafael Ortega <> Date: Tue, 8 Oct 2019 15:19:50 +0200 Subject: [PATCH 3/3] update app dependencies --- app/build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4b9faec..b6433cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion '25.0.0' + compileSdkVersion 28 + buildToolsVersion '25.0.3' defaultConfig { applicationId "wendu.jsbdemo" - minSdkVersion 11 - targetSdkVersion 23 + minSdkVersion 14 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -23,14 +23,14 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile project(path: ':dsbridge') - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.squareup.okhttp3:okhttp:3.3.0' - testCompile 'junit:junit:4.12' + implementation project(path: ':dsbridge') + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.squareup.okhttp3:okhttp:3.3.0' + testImplementation 'junit:junit:4.12' }