Skip to content

Commit 933e7a4

Browse files
committed
Synced latest changes from parent repo
1 parent ac9258d commit 933e7a4

File tree

96 files changed

+10308
-9212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+10308
-9212
lines changed

generators/app/sync_template.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function checkOutAndCopy(repo, name) {
3030
})
3131
.then(function () {
3232
replace({
33-
regex: 'in.mvpstarter.sample',
33+
regex: 'io.mvpstarter.sample',
3434
replacement: '<%= appPackage %>',
3535
paths: ['./tmp/app'],
3636
recursive: true,

generators/app/templates/.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android:
88
- platform-tools
99
- tools # to get the new `repository-11.xml`
1010
- tools # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943)
11-
- build-tools-25.0.2
12-
- android-25
11+
- build-tools-26.0.0
12+
- android-26
1313
- extra-android-m2repository
1414
- extra-google-m2repository
1515
- extra-android-support

generators/app/templates/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ To ensure that your code is valid and stable use check:
8484
./gradlew check
8585
```
8686

87+
### Created & Maintained By
88+
[Ravindra Kumar](https://github.com/ravidsrk) ([@ravidsrk](https://www.twitter.com/ravidsrk))
89+
90+
> If you found this repo helpful or you learned something from the source code and want to thank me, consider [buying me a cup of](https://www.paypal.me/ravidsrk) :coffee:
91+
8792
## License
8893
```
8994
MIT License

generators/app/templates/app/build.gradle

+22-33
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22
apply from: '../config/quality/quality.gradle'
3-
apply plugin: 'me.tatarka.retrolambda'
43
apply plugin: 'jacoco'
4+
apply plugin: 'com.github.ben-manes.versions'
55
//apply plugin: 'io.fabric'
66

77
android {
8-
compileSdkVersion 25
9-
buildToolsVersion '25.0.2'
8+
compileSdkVersion 26
9+
buildToolsVersion '26.0.0'
1010

1111
dexOptions {
1212
maxProcessCount 4
@@ -16,11 +16,10 @@ android {
1616

1717
defaultConfig {
1818
defaultPublishConfig 'debug'
19-
publishNonDefault true
2019

2120
applicationId "<%= appPackage %>"
22-
minSdkVersion 18
23-
targetSdkVersion 25
21+
minSdkVersion 19
22+
targetSdkVersion 26
2423
testInstrumentationRunner "${applicationId}.runner.RxAndroidJUnitRunner"
2524
versionCode 1000
2625
// Major -> Millions, Minor -> Thousands, Bugfix -> Hundreds. E.g 1.3.72 == 1,003,072
@@ -90,56 +89,46 @@ configurations.all {
9089
}
9190
}
9291

93-
retrolambda {
94-
jvmArgs '-noverify'
95-
incremental true
96-
}
9792

9893
apply from: 'dependencies.gradle'
9994

10095
dependencies {
10196

102-
compile supportLibs
103-
compile networkLibs
104-
compile rxJavaLibs
105-
compile googlePlayLibs
97+
implementation supportLibs
98+
implementation networkLibs
99+
implementation rxJavaLibs
100+
implementation googlePlayLibs
106101

107-
compile 'com.github.bumptech.glide:glide:3.7.0'
108-
compile('com.github.bumptech.glide:okhttp3-integration:1.4.0') {
102+
implementation 'com.github.bumptech.glide:glide:3.7.0'
103+
implementation('com.github.bumptech.glide:okhttp3-integration:1.4.0') {
109104
exclude group: 'glide-parent'
110105
}
111106

112107
//RxPermission for easy runtime permission management
113-
compile 'com.tbruyelle.rxpermissions:rxpermissions:0.9.1@aar'
108+
implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar'
114109

115-
compile "com.jakewharton:butterknife:$versions.butterKnife"
116-
compile "com.jakewharton.timber:timber:4.5.1"
117-
compile "com.facebook.stetho:stetho-okhttp3:1.4.2"
110+
implementation "com.jakewharton:butterknife:$versions.butterKnife"
111+
implementation "com.jakewharton.timber:timber:4.5.1"
112+
implementation "com.facebook.stetho:stetho-okhttp3:1.5.0"
118113

119-
compile "com.google.dagger:dagger:$versions.dagger"
120-
provided 'org.glassfish:javax.annotation:10.0-b28' //Required by Dagger2
114+
implementation "com.google.dagger:dagger:$versions.dagger"
115+
compileOnly 'org.glassfish:javax.annotation:10.0-b28' //Required by Dagger2
121116

122-
debugCompile leakCannary
123-
releaseCompile leakCannary
124-
testCompile leakCannary
117+
debugImplementation leakCannary
118+
releaseImplementation leakCannary
119+
testImplementation leakCannary
125120

126121
// APT dependencies
127122
annotationProcessor "com.jakewharton:butterknife-compiler:$versions.butterKnife"
128123
annotationProcessor daggerCompiler
129124
testAnnotationProcessor daggerCompiler
130125
androidTestAnnotationProcessor daggerCompiler
131126

132-
testCompile unitTestLibs
133-
androidTestCompile androidTestsLibs
134-
135-
retrolambdaConfig 'net.orfjackal.retrolambda:retrolambda:2.5.0'
127+
testImplementation unitTestLibs
128+
androidTestImplementation androidTestsLibs
136129
}
137130

138131
// Log out test results to console
139132
tasks.matching { it instanceof Test }.all {
140133
testLogging.events = ["failed", "passed", "skipped"]
141-
}
142-
143-
tasks.withType(JavaCompile) {
144-
options.compilerArgs << "-Xlint:deprecation" << "-Werror"
145134
}

generators/app/templates/app/dependencies.gradle

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
ext {
22
versions = [
3-
support : "25.2.0",
4-
firebase : '10.2.0',
5-
okHttp : "3.5.0",
6-
retrofit : '2.2.0',
3+
support : "26.0.0-beta2",
4+
firebase : '11.0.0',
5+
okHttp : "3.8.0",
6+
retrofit : '2.3.0',
77
espresso : '2.2.2',
88
espressoRunner: '0.5',
99
powerMock : '1.6.6',
1010
hamcrest : '1.3',
11-
restMock : '0.2.0',
12-
dagger : '2.8',
13-
butterKnife : '8.5.1'
11+
restMock : '0.2.1',
12+
dagger : '2.11',
13+
butterKnife : '8.6.0'
1414
]
1515

16-
mockito = [mockito: "org.mockito:mockito-core:2.6.8"]
16+
mockito = [mockito: "org.mockito:mockito-core:2.8.9"]
1717
junit = [junit: "junit:junit:4.12"]
1818
restMock = [restMock: "com.github.andrzejchm.RESTMock:android:$versions.restMock"]
1919

@@ -27,7 +27,7 @@ ext {
2727
]
2828

2929
rxJava = [
30-
rxJava : "io.reactivex.rxjava2:rxjava:2.0.5",
30+
rxJava : "io.reactivex.rxjava2:rxjava:2.1.0",
3131
rxAndroid: "io.reactivex.rxjava2:rxandroid:2.0.1"
3232
]
3333

@@ -57,10 +57,10 @@ ext {
5757
supportAnnotation : "com.android.support:support-annotations:$versions.support",
5858
restMock : "com.github.andrzejchm.RESTMock:android:$versions.restMock",
5959
easymock : "org.easymock:easymock:3.4",
60-
assertj : "com.squareup.assertj:assertj-android:1.1.1", // AssertJ
61-
powermockCore : "org.powermock:powermock-core:$versions.powerMock", // PowerMock
60+
assertj : "com.squareup.assertj:assertj-android:1.1.1",
61+
powermockCore : "org.powermock:powermock-core:$versions.powerMock",
6262
powermockModuleJunit: "org.powermock:powermock-module-junit4:$versions.powerMock",
63-
powermockApiEasymock: "org.powermock:powermock-api-easymock:$versions.powerMock" // PowerMock + EasyMock extension
63+
powermockApiEasymock: "org.powermock:powermock-api-easymock:$versions.powerMock"
6464
] + junit + mockito + restMock
6565

6666
androidTests = [
@@ -78,6 +78,6 @@ ext {
7878
unitTestLibs = unitTest.values()
7979
androidTestsLibs = androidTests.values() + supportLibs
8080

81-
leakCannary = "com.squareup.leakcanary:leakcanary-android:1.5"
81+
leakCannary = "com.squareup.leakcanary:leakcanary-android:1.5.1"
8282
daggerCompiler = "com.google.dagger:dagger-compiler:$versions.dagger"
83-
}
83+
}

0 commit comments

Comments
 (0)