From 50552d8b3ab83a69175ac891a7b582bbfbe2575c Mon Sep 17 00:00:00 2001 From: chengle Date: Fri, 9 Feb 2018 10:49:27 +0800 Subject: [PATCH] fix built issues. --- KSYLiveDemo/.idea/misc.xml | 12 +------- KSYLiveDemo/app/build.gradle | 30 +++++++++---------- KSYLiveDemo/build.gradle | 4 ++- .../gradle/wrapper/gradle-wrapper.properties | 4 +-- KSYLiveDemo/libksylive/build.gradle | 10 +++---- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/KSYLiveDemo/.idea/misc.xml b/KSYLiveDemo/.idea/misc.xml index 4d86a1e..cfb49ce 100644 --- a/KSYLiveDemo/.idea/misc.xml +++ b/KSYLiveDemo/.idea/misc.xml @@ -64,17 +64,7 @@ - - - - - - - - - - - + diff --git a/KSYLiveDemo/app/build.gradle b/KSYLiveDemo/app/build.gradle index e200519..0387f0c 100644 --- a/KSYLiveDemo/app/build.gradle +++ b/KSYLiveDemo/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.0" + compileSdkVersion 27 + buildToolsVersion "27.0.1" defaultConfig { applicationId "com.ksyun.live.demo" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -20,17 +20,17 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.lht:paintview:1.16' - compile 'com.facebook.fresco:fresco:1.4.0' - compile 'com.facebook.fresco:animated-gif:1.4.0' - compile 'com.facebook.fresco:animated-webp:1.4.0' - compile 'com.google.code.gson:gson:2.7' - compile 'com.jakewharton:butterknife:8.8.1' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:27.0.1' + implementation 'com.android.support:design:27.0.1' + implementation 'com.lht:paintview:1.17' + implementation 'com.facebook.fresco:fresco:1.4.0' + implementation 'com.facebook.fresco:animated-gif:1.4.0' + implementation 'com.facebook.fresco:animated-webp:1.4.0' + implementation 'com.google.code.gson:gson:2.8.0' + implementation 'com.jakewharton:butterknife:8.8.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' - compile 'com.h6ah4i.android.widget.verticalseekbar:verticalseekbar:0.7.2' - compile project(':libksylive') - compile files('libs/zxing.jar') + implementation 'com.h6ah4i.android.widget.verticalseekbar:verticalseekbar:0.7.2' + implementation project(':libksylive') + implementation files('libs/zxing.jar') } diff --git a/KSYLiveDemo/build.gradle b/KSYLiveDemo/build.gradle index c2eea8e..7e01a0a 100644 --- a/KSYLiveDemo/build.gradle +++ b/KSYLiveDemo/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/KSYLiveDemo/gradle/wrapper/gradle-wrapper.properties b/KSYLiveDemo/gradle/wrapper/gradle-wrapper.properties index 9a778d6..2237354 100644 --- a/KSYLiveDemo/gradle/wrapper/gradle-wrapper.properties +++ b/KSYLiveDemo/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Fri Feb 09 10:39:56 CST 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.1-all.zip diff --git a/KSYLiveDemo/libksylive/build.gradle b/KSYLiveDemo/libksylive/build.gradle index 6757114..5d05c7e 100644 --- a/KSYLiveDemo/libksylive/build.gradle +++ b/KSYLiveDemo/libksylive/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.0" + compileSdkVersion 27 + buildToolsVersion "27.0.1" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -24,6 +24,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' + api fileTree(dir: 'libs', include: ['*.jar']) + compileOnly 'com.android.support:appcompat-v7:27.0.1' }