8000 Feature/david/refresh versions (#1090) · libandroid/Android@b0b6c1d · GitHub
[go: up one dir, main page]
Skip to content

Commit b0b6c1d

Browse files
malmsteinmalmstein
authored
Feature/david/refresh versions (duckduckgo#1090)
* added refreshVersions to manage dependency updates * cleanup library updates for the PR
1 parent 05e86b4 commit b0b6c1d

File tree

3 files changed

+112
-61
lines changed

3 files changed

+112
-61
lines changed

‎app/build.gradle

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,14 @@ ext {
110110
legacySupport = "1.0.0"
111111
coreTesting = "2.1.0"
112112
testRunner = "1.3.0"
113-
coroutines = "1.4.2"
113+
coroutines = "1.3.5"
114+
retrofitCoroutinesAdapter = "0.9.2"
114115
webkit = "1.3.0"
115116
referrerLibrary = "1.1.2"
116117

117118
junit = "4.12"
118119
dagger = "2.27"
119-
retrofit = "2.9.0"
120+
retrofit = "2.8.1"
120121
ankoVersion = "0.10.4"
121122
glide = "4.11.0"
122123
lottieVersion = "3.4.0"
@@ -133,96 +134,96 @@ ext {
133134

134135

135136
dependencies {
136-
implementation "androidx.legacy:legacy-support-v4:$legacySupport"
137-
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanary"
137+
implementation AndroidX.legacy.supportV4
138+
debugImplementation Square.leakCanary.android
138139

139140
implementation fileTree(dir: 'libs', include: ['*.jar'])
140141

141-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
142-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
143-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
144-
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines") {
142+
implementation Kotlin.stdlib.jdk7
143+
implementation KotlinX.coroutines.core
144+
implementation KotlinX.coroutines.android
145+
androidTestImplementation (KotlinX.coroutines.test) {
145146
// https://github.com/Kotlin/kotlinx.coroutines/issues/2023
146147
// conflicts with mockito due to direct inclusion of byte buddy
147148
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
148149
}
149150

150-
implementation "androidx.appcompat:appcompat:$androidX"
151-
implementation "com.google.android.material:material:$materialDesign"
152-
implementation "androidx.constraintlayout:constraintlayout:$constraintLayout"
153-
implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swipeRefreshLayout"
154-
implementation "androidx.webkit:webkit:$webkit"
155-
implementation "com.squareup.okhttp3:okhttp:$okHttp"
156-
implementation "com.squareup.okhttp3:okhttp-tls:$okHttp"
157-
implementation "com.squareup.retrofit2:retrofit:$retrofit"
158-
implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
159-
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
160-
implementation "com.squareup.retrofit2:converter-scalars:$retrofit"
161-
implementation "io.reactivex.rxjava2:rxjava:$rxJava"
162-
implementation "io.reactivex.rxjava2:rxandroid:$rxAndroid"
163-
implementation "com.jakewharton.timber:timber:$timber"
164-
implementation "com.google.dagger:dagger-android:$dagger"
165-
implementation "com.google.dagger:dagger-android-support:$dagger"
151+
implementation AndroidX.appCompat
152+
implementation Google.android.material
153+
implementation AndroidX.constraintLayout
154+
implementation AndroidX.swipeRefreshLayout
155+
implementation AndroidX.webkit
156+
implementation Square.okHttp3.okHttp
157+
implementation "com.squareup.okhttp3:okhttp-tls:_"
158+
implementation Square.retrofit2.retrofit
159+
implementation Square.retrofit2.converter.moshi
160+
implementation Square.retrofit2.adapter.rxJava2
161+
implementation Square.retrofit2.converter.scalars
162+
implementation "io.reactivex.rxjava2:rxjava:_"
163+
implementation "io.reactivex.rxjava2:rxandroid:_"
164+
implementation JakeWharton.timber
165+
implementation Google.dagger.android
166+
implementation Google.dagger.android.support
166167

167168
// RxRelay
168-
implementation "com.jakewharton.rxrelay2:rxrelay:$rxRelay"
169+
implementation "com.jakewharton.rxrelay2:rxrelay:_"
169170

170171
// Anko
171-
implementation "org.jetbrains.anko:anko-commons:$ankoVersion"
172-
implementation "org.jetbrains.anko:anko-design:$ankoVersion"
172+
implementation "org.jetbrains.anko:anko-commons:_"
173+
implementation "org.jetbrains.anko:anko-design:_"
173174

174175
// Android KTX
175-
implementation "androidx.core:core-ktx:$androidKtxCore"
176-
implementation "androidx.fragment:fragment-ktx:$fragmentKtx"
176+
implementation AndroidX.core.ktx
177+
implementation AndroidX.fragmentKtx
177178

178179
// ViewModel and LiveData
179-
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
180-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
181-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
180+
implementation AndroidX.lifecycle.extensions
181+
implementation AndroidX.lifecycle.viewModelKtx
182+
implementation AndroidX.lifecycle.liveDataKtx
182183

183-
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle"
184-
testImplementation "androidx.arch.core:core-testing:$coreTesting"
185-
androidTestImplementation "androidx.arch.core:core-testing:$coreTesting"
184+
implementation AndroidX.lifecycle.commonJava8
185+
testImplementation AndroidX.archCore.testing
186+
androidTestImplementation AndroidX.archCore.testing
186187

187188
// Room
188-
implementation "androidx.room:room-runtime:$room"
189-
implementation "androidx.room:room-rxjava2:$room"
190-
implementation "androidx.room:room-ktx:$room"
191-
kapt "androidx.room:room-compiler:$room"
192-
testImplementation "androidx.room:room-testing:$room"
193-
androidTestImplementation "androidx.room:room-testing:$room"
189+
implementation AndroidX.room.runtime
190+
implementation AndroidX.room.rxJava2
191+
implementation AndroidX.room.ktx
192+
kapt AndroidX.room.compiler
193+
testImplementation AndroidX.room.testing
194+
androidTestImplementation AndroidX.room.testing
194195

195196
// WorkManager
196-
implementation "androidx.work:work-runtime-ktx:$workManager"
197-
androidTestImplementation "androidx.work:work-testing:$workManager"
198-
implementation "androidx.work:work-rxjava2:$workManager"
197+
implementation AndroidX.work.runtimeKtx
198+
androidTestImplementation AndroidX.work.testing
199+
implementation AndroidX.work.rxJava2
199200

200201
// Dagger
201-
kapt "com.google.dagger:dagger-android-processor:$dagger"
202-
kapt "com.google.dagger:dagger-compiler:$dagger"
203-
kaptAndroidTest "com.google.dagger:dagger-android-processor:$dagger"
204-
kaptAndroidTest "com.google.dagger:dagger-compiler:$dagger"
202+
kapt Google.dagger.android.processor
203+
kapt Google.dagger.compiler
204+
kaptAndroidTest "com.google.dagger:dagger-android-processor:_"
205+
kaptAndroidTest "com.google.dagger:dagger-compiler:_"
205206

206207
// Glide
207-
implementation "com.github.bumptech.glide:glide:$glide"
208-
implementation "com.github.bumptech.glide:okhttp3-integration:$glide"
209-
kapt "com.github.bumptech.glide:compiler:$glide"
208+
implementation "com.github.bumptech.glide:glide:_"
209+
implementation "com.github.bumptech.glide:okhttp3-integration:_"
210+
kapt "com.github.bumptech.glide:compiler:_"
210211

211212
// Lottie
212-
implementation "com.airbnb.android:lottie:$lottieVersion"
213+
implementation "com.airbnb.android:lottie:_"
213214

214215
// Apache commons
215-
implementation "org.apache.commons:commons-math3:$commonsMath"
216+
implementation "org.apache.commons:commons-math3:_"
216217

217218
// Play Store referrer library
218-
implementation("com.android.installreferrer:installreferrer:$referrerLibrary")
219+
implementation("com.android.installreferrer:installreferrer:_")
219220

220221
// Testing dependencies
221-
androidTestImplementation "androidx.test:runner:$testRunner"
222-
androidTestImplementation "androidx.test:rules:$testRunner"
223-
androidTestUtil "androidx.test:orchestrator:$testRunner"
224-
androidTestImplementation "org.mockito:mockito-android:$mockito"
225-
androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
226-
androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okHttp"
227-
androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
222+
androidTestImplementation AndroidX.test.runner
223+
androidTestImplementation AndroidX.test.rules
224+
androidTestUtil AndroidX.test.orchestrator
225+
androidTestImplementation Testing.mockito.android
226+
androidTestImplementation Testing.mockito.kotlin
227+
androidTestImplementation Square.okHttp3.mockWebServer
228+
androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:_"
228229
}

‎settings.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1+
import de.fayard.refreshVersions.RefreshVersionsSetup
2+
3+
buildscript {
4+
repositories { gradlePluginPortal() }
5+
dependencies.classpath("de.fayard.refreshVersions:refreshVersions:0.9.7")
6+
}
7+
8+
RefreshVersionsSetup.bootstrap(settings)
9+
110
include ':app'

‎versions.properties

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
## suppress inspection "SpellCheckingInspection" for whole file
2+
## suppress inspection "UnusedProperty" for whole file
3+
##
4+
## Dependencies and Plugin versions with their available updates
5+
## Generated by $ ./gradlew refreshVersions
6+
## Please, don't put extra comments in that file yet, keeping them is not supported yet.
7+
8+
version.androidx.appcompat=1.2.0
9+
version.androidx.arch.core=2.1.0
10+
version.androidx.constraintlayout=2.0.4
11+
version.androidx.core=1.3.2
12+
version.androidx.fragment=1.2.5
13+
version.androidx.legacy=1.0.0
14+
version.androidx.lifecycle=2.2.0
15+
version.androidx.room=2.2.5
16+
version.androidx.swiperefreshlayout=1.1.0
17+
version.androidx.test=1.3.0
18+
version.androidx.webkit=1.3.0
19+
version.androidx.work=2.4.0
20+
version.com.airbnb.android..lottie=3.4.0
21+
version.com.android.installreferrer..installreferrer=1.1.2
22+
version.com.github.bumptech.glide..compiler=4.11.0
23+
version.com.github.bumptech.glide..glide=4.11.0
24+
version.com.github.bumptech.glide..okhttp3-integration=4.11.0
25+
version.com.jakewharton.retrofit..retrofit2-kotlin-coroutines-adapter=0.9.2
26+
version.com.jakewharton.rxrelay2..rxrelay=2.0.0
27+
version.com.jakewharton.timber..timber=4.7.1
28+
version.com.nhaarman.mockitokotlin2..mockito-kotlin=2.1.0
29+
version.google.android.material=1.2.1
30+
version.google.dagger=2.27
31+
version.io.reactivex.rxjava2..rxandroid=2.0.2
32+
version.io.reactivex.rxjava2..rxjava=2.1.10
33+
version.kotlin=1.4.10
34+
version.kotlinx.coroutines=1.3.5
35+
version.leakcanary=2.5
36+
version.okhttp3=4.9.0
37+
version.org.apache.commons..commons-math3=3.6.1
38+
version.org.jetbrains.anko..anko-commons=0.10.4
39+
version.org.jetbrains.anko..anko-design=0.10.4
40+
version.org.mockito..mockito-android=3.4.6
41+
version.retrofit2=2.8.1

0 commit comments

Comments
 (0)
0