Skip to content

Commit 4e2d0d1

Browse files
crgee1rubikzube
andauthored
[CSL 631] Further androidX compatibility changes (#73)
* Changes with a buildable gradle * Update versions for tests Co-authored-by: Zubin Tiku <[email protected]>
1 parent 661d78c commit 4e2d0d1

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

library/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ tasks.withType(Test) {
1717
}
1818

1919
android {
20-
compileSdkVersion 28
20+
compileSdkVersion 30
2121

2222
dexOptions {
2323
maxProcessCount 4
2424
preDexLibraries false
2525
}
2626

2727
defaultConfig {
28-
minSdkVersion 19
29-
targetSdkVersion 28
28+
minSdkVersion 21
29+
targetSdkVersion 30
30+
multiDexEnabled true
3031
testInstrumentationRunner "${applicationId}.runner.RxAndroidJUnitRunner"
3132
versionCode 1
3233
versionName '2.9.0'
@@ -181,4 +182,5 @@ dependencies {
181182
kaptAndroidTest daggerCompiler
182183
testImplementation unitTestLibs
183184
androidTestImplementation androidTestsLibs
185+
implementation 'androidx.multidex:multidex:2.0.1'
184186
}

library/dependencies.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ext {
22
versions = [
3-
support : "28.0.0",
43
moshi : "1.8.0",
54
okHttp : "3.14.1",
65
retrofit: '2.5.0',
@@ -11,8 +10,8 @@ ext {
1110
junit = [junit: "junit:junit:$versions.junit"]
1211

1312
supportDeps = [
14-
appcompatV7 : "com.android.support:appcompat-v7:$versions.support",
15-
recyclerView: "com.android.support:recyclerview-v7:$versions.support",
13+
appcompatV7 : "androidx.appcompat:appcompat:1.3.1",
14+
recyclerView: "androidx.recyclerview:recyclerview:1.2.1",
1615
]
1716

1817
retrofit = [
@@ -31,7 +30,7 @@ ext {
3130
]
3231

3332
unitTest = [
34-
supportAnnotation: "com.android.support:support-annotations:$versions.support",
33+
supportAnnotation: "androidx.annotation:annotation:1.2.0",
3534
kotlinTest : "org.jetbrains.kotlin:kotlin-test:$kotlin_version",
3635
kotlinJunit : "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version",
3736

library/src/test/java/io/constructor/core/ConstructorIoRecommendationsTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class ConstructorIoRecommendationsTest {
6767
it.get()!!.response?.resultCount == 225
6868
}
6969
val request = mockServer.takeRequest()
70-
println(request.path)
7170
val path = "/recommendations/v1/pods/titanic?key=golden-key&i=guido-the-guid&ui=player-one&s=79&c=cioand-2.9.0&_dt="
7271
assert(request.path.startsWith(path))
7372
}

sample/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion 28
6+
compileSdkVersion 30
77
defaultConfig {
88
applicationId "io.constructor.sample"
9-
minSdkVersion 19
10-
targetSdkVersion 28
9+
minSdkVersion 21
10+
targetSdkVersion 30
1111
versionCode 1
1212
versionName "1.0"
1313
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

0 commit comments

Comments
 (0)