Skip to content
This repository has been archived by the owner on Oct 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
derohimat committed May 16, 2017
2 parents 05bbb00 + 21d31a3 commit 4f6f0eb
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.2'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
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 @@
#Wed Aug 31 15:31:28 ICT 2016
#Tue May 16 14:48:52 WIB 2017
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-3.3-all.zip
8 changes: 4 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ group = 'com.github.derohimat'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
buildToolsVersion '25.0.3'

defaultConfig {
minSdkVersion 15
targetSdkVersion 25
versionCode 5
versionName "0.5"
versionCode 6
versionName "0.6"
}
}

Expand All @@ -22,7 +22,7 @@ repositories {
}

dependencies {
final SUPPORT_LIBRARY_VERSION = '25.1.0'
final SUPPORT_LIBRARY_VERSION = '25.3.1'

compile fileTree(include: ['*.jar'], dir: 'libs')

Expand Down
15 changes: 8 additions & 7 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply from: '../config/quality.gradle'

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

signingConfigs {
config {
Expand All @@ -21,8 +21,8 @@ android {
applicationId "net.derohimat.samplebasemvp"
minSdkVersion 15
targetSdkVersion 25
versionCode 5
versionName "0.5"
versionCode 6
versionName "0.6"
}

buildTypes {
Expand Down Expand Up @@ -61,12 +61,13 @@ android {
}

dependencies {
final RETROFIT_VERSION = '2.1.0'
final OKHTTP_VERSION = '3.5.0'
final DAGGER_VERSION = '2.8'
final RETROFIT_VERSION = '2.3.0'
final OKHTTP_VERSION = '3.8.0'
final DAGGER_VERSION = '2.10'

compile project(':library')
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support.constraint:constraint-layout:1.0.2'

//----- Dagger
compile "com.google.dagger:dagger:$DAGGER_VERSION"
Expand Down Expand Up @@ -96,7 +97,7 @@ dependencies {
//----- Testing
testCompile 'junit:junit:4.12'
androidTestApt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
androidTestCompile 'com.android.support:support-annotations:25.1.0'
androidTestCompile 'com.android.support:support-annotations:25.3.1'
androidTestCompile "com.android.support.test:runner:0.5"
androidTestCompile "com.android.support.test:rules:0.5"
androidTestCompile "com.android.support.test.espresso:espresso-core:2.2.2"
Expand Down

0 comments on commit 4f6f0eb

Please sign in to comment.