kopia lustrzana https://github.com/felHR85/UsbSerial
Merge pull request #139 from felHR85/upgradeAndroidGradleTools
Upgrade android Gradle toolspull/140/head
commit
460cddcf2e
|
@ -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'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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')
|
||||
}
|
||||
|
|
|
@ -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')
|
||||
}
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
Ładowanie…
Reference in New Issue