diff --git a/build.gradle b/build.gradle index 3d5ba79..16b5c3c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,11 @@ buildscript { repositories { jcenter() + google() + } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } diff --git a/example/build.gradle b/example/build.gradle index b1a4f10..a19d12b 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -3,7 +3,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { applicationId "com.felhr.serialportexample" @@ -21,9 +20,9 @@ android { } dependencies { - compile 'com.android.support:support-v4:23.1.1' - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:design:23.1.1' + implementation 'com.android.support:support-v4:23.1.1' + implementation 'com.android.support:appcompat-v7:23.1.1' + implementation 'com.android.support:design:23.1.1' - compile project(':usbserial') + implementation project(':usbserial') } diff --git a/examplesync/build.gradle b/examplesync/build.gradle index 09b45de..33d2c7c 100644 --- a/examplesync/build.gradle +++ b/examplesync/build.gradle @@ -3,7 +3,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { applicationId "com.felhr.serialportexamplesync" @@ -21,9 +20,9 @@ android { } dependencies { - compile 'com.android.support:support-v4:23.1.1' - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:design:23.1.1' + implementation 'com.android.support:support-v4:23.1.1' + implementation 'com.android.support:appcompat-v7:23.1.1' + implementation 'com.android.support:design:23.1.1' - compile project(':usbserial') + implementation project(':usbserial') } diff --git a/gradle.properties b/gradle.properties index 7837fbb..51250a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,5 @@ VERSION_NAME=1.0 VERSION_CODE=1 - ANDROID_BUILD_MIN_SDK_VERSION=12 ANDROID_BUILD_TARGET_SDK_VERSION=23 ANDROID_BUILD_SDK_VERSION=23 -ANDROID_BUILD_TOOLS_VERSION=23.0.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d593ba..3f26e00 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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.1-all.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/usbserial/build.gradle b/usbserial/build.gradle index f246363..29a0b55 100644 --- a/usbserial/build.gradle +++ b/usbserial/build.gradle @@ -6,7 +6,6 @@ android { version = '1.0.0' compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION compileOptions { encoding "UTF-8" @@ -20,12 +19,12 @@ android { } //noinspection GroovyAssignabilityCheck - task deleteJar(type: org.gradle.api.tasks.Delete){ + task deleteJar(type: org.gradle.api.tasks.Delete) { delete 'eclipse_lib/usbserial.jar' } //noinspection GroovyAssignabilityCheck - task createJar(type: org.gradle.api.tasks.Copy){ + task createJar(type: org.gradle.api.tasks.Copy) { from('build/intermediates/bundles/release/') into('eclipse_lib/') include('classes.jar')