Skip to content

Commit 0e66006

Browse files
committed
update deps
1 parent ab4cf38 commit 0e66006

File tree

20 files changed

+256
-32
lines changed

20 files changed

+256
-32
lines changed

.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/Project.xml

Lines changed: 139 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 29
6-
buildToolsVersion "29.0.3"
5+
compileSdkVersion 30
6+
buildToolsVersion "30.0.1"
77

88
defaultConfig {
9-
applicationId "com.hoc.mergeadapter_sample"
9+
applicationId "com.hoc.concatdapter_sample"
1010
minSdkVersion 23
11-
targetSdkVersion 29
11+
targetSdkVersion 30
1212
versionCode 1
1313
versionName "1.0"
1414

@@ -42,19 +42,21 @@ dependencies {
4242

4343
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
4444

45-
implementation 'androidx.appcompat:appcompat:1.1.0'
46-
implementation 'androidx.core:core-ktx:1.3.0'
47-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
48-
implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha03'
49-
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
50-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
51-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
52-
implementation 'androidx.fragment:fragment-ktx:1.2.4'
53-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
45+
implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
46+
implementation 'androidx.core:core-ktx:1.5.0-alpha01'
47+
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1'
48+
implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05'
49+
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
50+
51+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha06'
52+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha06'
53+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha06'
54+
55+
implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha07'
5456

5557
// coroutines
56-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'
57-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'
58+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
59+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
5860

5961
testImplementation 'junit:junit:4.13'
6062
androidTestImplementation 'androidx.test.ext:junit:1.1.1'

app/src/androidTest/java/com/hoc/mergeadapter_sample/ExampleInstrumentedTest.kt renamed to app/src/androidTest/java/com/hoc/concatadapter_sample/ExampleInstrumentedTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.hoc.mergeadapter_sample
1+
package com.hoc.concatadapter_sample
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4

0 commit comments

Comments
 (0)