Skip to content

Commit

Permalink
update to latest SDK and gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurHub committed Sep 1, 2017
1 parent 4ac1339 commit 85b624c
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android:
- tools
- platform-tools
- tools
- build-tools-25.0.2
- android-25
- build-tools-26.0.1
- android-26
- extra-android-m2repository

script:
Expand Down
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
}
}

allprojects {
repositories {
mavenLocal()
jcenter()
mavenLocal()
mavenCentral()
maven {
url "https://maven.google.com"
}
}
}
13 changes: 6 additions & 7 deletions cropper/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: 'com.android.library'
// https://docs.gradle.org/current/userguide/publishing_maven.html
// http://www.flexlabs.org/2013/06/using-local-aar-android-library-packages-in-gradle-builds
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'maven-publish'

group='com.github.ArthurHub'
Expand All @@ -15,11 +14,11 @@ ext {

android {

compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 26
buildToolsVersion '26.0.1'
defaultConfig {
minSdkVersion 10
targetSdkVersion 25
minSdkVersion 14
targetSdkVersion 26
versionCode 1
versionName PUBLISH_VERSION
}
Expand Down Expand Up @@ -52,7 +51,7 @@ publishing {
apply from: 'https://raw.githubusercontent.com/ArthurHub/release-android-library/master/android-release-aar.gradle'

dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'
compile "com.android.support:exifinterface:25.3.1"
compile 'com.android.support:appcompat-v7:26.0.2'
compile "com.android.support:exifinterface:26.0.2"
}

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-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
8 changes: 4 additions & 4 deletions quick-start/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 26
buildToolsVersion '26.0.1'

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 26
versionCode 1
versionName '1.0'
}
Expand All @@ -17,5 +17,5 @@ android {

dependencies {
compile project(':cropper')
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:appcompat-v7:26.0.2'
}
8 changes: 4 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 26
buildToolsVersion '26.0.1'

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 26
versionCode 1
versionName '1.0'
}
Expand All @@ -17,5 +17,5 @@ android {

dependencies {
compile project(':cropper')
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:appcompat-v7:26.0.2'
}
10 changes: 5 additions & 5 deletions test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 26
buildToolsVersion '26.0.1'

defaultConfig {
minSdkVersion 11
targetSdkVersion 25
minSdkVersion 14
targetSdkVersion 26
versionCode 1
versionName '1.0'
}
Expand All @@ -16,7 +16,7 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:appcompat-v7:26.0.2'
compile 'com.theartofdev.edmodo:android-image-cropper:2.4.+'

}

0 comments on commit 85b624c

Please sign in to comment.