Skip to content

Commit

Permalink
update gradle & support lib version
Browse files Browse the repository at this point in the history
  • Loading branch information
jaeger committed Mar 8, 2018
1 parent 03dee3c commit 343aaf8
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 29 deletions.
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -16,9 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
maven {
url "http://dl.bintray.com/laobie/maven"
}
google()
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
18 changes: 9 additions & 9 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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
Expand Down Expand Up @@ -90,7 +90,7 @@ bintray {
configurations = ['archives']
pkg {
repo = "maven"
name = "StatusBarUtil"
name = "statusbarutil"
desc = 'Android StatusBar Util'
websiteUrl = siteUrl
issueTrackerUrl = issueUrl
Expand Down
27 changes: 13 additions & 14 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}

0 comments on commit 343aaf8

Please sign in to comment.