Skip to content

Commit

Permalink
update gradle config
Browse files Browse the repository at this point in the history
  • Loading branch information
donglua committed Jul 31, 2018
1 parent 33f03d3 commit 2c3eb00
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 38 deletions.
40 changes: 19 additions & 21 deletions PhotoPicker/build.gradle
Original file line number Diff line number Diff line change
@@ -1,39 +1,37 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 28
buildToolsVersion '27.0.3'
resourcePrefix "__picker_"

dexOptions {
javaMaxHeapSize "4g"
}
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 28
}
lintOptions {
abortOnError false
}
}
ext {
supportLibVersion = "26.1.0"
}

dependencies {
compile "com.android.support:support-v4:$supportLibVersion"
compile "com.android.support:appcompat-v7:$supportLibVersion"
compile "com.android.support:design:$supportLibVersion"
compile "com.android.support:recyclerview-v7:$supportLibVersion"
compile "com.android.support:support-annotations:$supportLibVersion"
compile "com.github.bumptech.glide:glide:4.1.1"
implementation "com.android.support:support-v4:$supportLibVersion"
implementation "com.android.support:appcompat-v7:$supportLibVersion"
implementation "com.android.support:design:$supportLibVersion"
implementation "com.android.support:recyclerview-v7:$supportLibVersion"
implementation "com.android.support:support-annotations:$supportLibVersion"
implementation "com.github.bumptech.glide:glide:4.1.1"
}

apply plugin: 'com.novoda.bintray-release'
publish {
userOrg = 'donglua'
groupId = 'me.iwf.photopicker'
artifactId = 'PhotoPicker'
publishVersion = '0.9.12'
desc = 'Photo Picker'
website = 'https://github.com/donglua/PhotoPicker'
}
//apply plugin: 'com.novoda.bintray-release'
//publish {
// userOrg = 'donglua'
// groupId = 'me.iwf.photopicker'
// artifactId = 'PhotoPicker'
// publishVersion = '0.9.12'
// desc = 'Photo Picker'
// website = 'https://github.com/donglua/PhotoPicker'
//}
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext {
supportLibVersion = "27.1.1"
}
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.3'

classpath 'com.novoda:bintray-release:0.7.0'
classpath 'com.novoda:bintray-release:0.8.1'

}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-4.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
26 changes: 12 additions & 14 deletions photopickerdemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ repositories {
}

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 28
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "me.iwf.PhotoPickerDemo"
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 28
versionCode 15
versionName "0.9.7"
}
Expand All @@ -39,18 +39,16 @@ android {


dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':PhotoPicker')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':PhotoPicker')


// compile 'me.iwf.photopicker:PhotoPicker:0.8.4@aar'
implementation "com.android.support:support-v4:$supportLibVersion"
implementation "com.android.support:appcompat-v7:$supportLibVersion"
implementation "com.android.support:design:$supportLibVersion"
implementation "com.android.support:recyclerview-v7:$supportLibVersion"
implementation "com.android.support:support-annotations:$supportLibVersion"
implementation "com.github.bumptech.glide:glide:4.1.1"

// compile 'com.android.support:appcompat-v7:23.4.0'
// compile 'com.android.support:recyclerview-v7:23.4.0'
// compile 'com.android.support:design:23.4.0'
// compile 'com.nineoldandroids:library:2.4.0'
// compile 'com.github.bumptech.glide:glide:3.7.0'
compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
transitive = true;
}
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.4'
}

0 comments on commit 2c3eb00

Please sign in to comment.