Skip to content

Commit

Permalink
Update the project to gradle 4.6 and build tools 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
George Metaxas committed Oct 4, 2018
1 parent 340b9ba commit c0483e0
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 25 deletions.
12 changes: 7 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -15,6 +16,7 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
}
}
Expand All @@ -25,9 +27,9 @@ task clean(type: Delete) {


ext {
buildToolsVersion = "25.0.0"
compileSdkVersion = 25
targetSdkVersion = 25
buildToolsVersion = "28.0.2"
compileSdkVersion = 27
targetSdkVersion = 27
minSdkVersion = 14
versionCode = 4
versionName = "0.0.4"
Expand Down
3 changes: 3 additions & 0 deletions config/quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ task checkstyle(type: Checkstyle) {
exclude '**/gen/**'

classpath = files()
checkstyle {
toolVersion = "6.5"
}
}


Expand Down
4 changes: 1 addition & 3 deletions config/quality/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,7 @@

<!-- Ensure a class has a package declaration. !-->
<!-- See http://checkstyle.sf.net/config_coding.html !-->
<module name="PackageDeclaration">
<property name="ignoreDirectoryName" value="true" />
</module>
<module name="PackageDeclaration" />

</module>
<module name="TreeWalker">
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-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
12 changes: 6 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.9.5'
testCompile 'org.robolectric:robolectric:3.0'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:recyclerview-v7:25.0.0'
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:1.9.5'
testImplementation 'org.robolectric:robolectric:3.0'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
}

Properties properties = new Properties()
Expand Down
18 changes: 8 additions & 10 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.0"
compileSdkVersion 27
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "fr.tvbarthel.intentsharesample"
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 3
versionName "1.2"
}
Expand All @@ -20,11 +20,9 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:design:25.0.0'
compile project(':library')
compile project(':picasso-loader')
compile project(':glide-loader')
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation project(':library')
}

0 comments on commit c0483e0

Please sign in to comment.