From 343aaf89d4c2bb694c8258605a45a14ee9d96bb7 Mon Sep 17 00:00:00 2001 From: jaeger Date: Thu, 8 Mar 2018 16:09:23 +0800 Subject: [PATCH] update gradle & support lib version --- build.gradle | 6 ++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 18 ++++++++-------- sample/build.gradle | 27 ++++++++++++------------ 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index bd62587..1107225 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' } @@ -16,9 +16,7 @@ buildscript { allprojects { repositories { jcenter() - maven { - url "http://dl.bintray.com/laobie/maven" - } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5f13bbf..80959d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 02 11:10:58 CST 2017 +#Thu Mar 08 15:16:34 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/library/build.gradle b/library/build.gradle index 425668b..14b3f9f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,17 +2,17 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "1.4.0" +version = "1.3.6" android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.2" resourcePrefix "statusbarutil_" defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -25,15 +25,15 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:27.1.0' + implementation 'com.android.support:design:27.1.0' } def siteUrl = 'https://github.com/laobie/StatusBarUtil' def gitUrl = 'https://github.com/laobie/StatusBarUtil.git' def issueUrl = 'https://github.com/laobie/StatusBarUtil/issues' -group = "com.jaeger.statusbarutil" +group = "com.jaeger.statusbaruitl" install { repositories.mavenInstaller { // This generates POM.xml with proper parameters @@ -90,7 +90,7 @@ bintray { configurations = ['archives'] pkg { repo = "maven" - name = "StatusBarUtil" + name = "statusbarutil" desc = 'Android StatusBar Util' websiteUrl = siteUrl issueTrackerUrl = issueUrl diff --git a/sample/build.gradle b/sample/build.gradle index 6de5ce4..f825fca 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,15 +2,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.2" defaultConfig { applicationId "com.jaeger.statusbardemo" minSdkVersion 14 - targetSdkVersion 25 - versionCode 7 - versionName "1.3.6" + targetSdkVersion 27 + versionCode 6 + versionName "1.3.2" } buildTypes { release { @@ -21,13 +21,12 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.ashokvarma.android:bottom-navigation-bar:1.3.0' - - compile 'com.jaeger.statusbarutil:library:1.4.0' - compile 'com.r0adkll:slidableactivity:2.0.5' -// compile project(path: ':library') + implementation fileTree(include: ['*.jar'], dir: 'libs') + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:27.1.0' + implementation 'com.android.support:design:27.1.0' + implementation 'com.ashokvarma.android:bottom-navigation-bar:1.3.0' + implementation 'com.r0adkll:slidableactivity:2.0.5' + implementation project(path: ':library') + // compile 'com.jaeger.statusbaruitl:library:1.3.2' }