Skip to content

Commit aee6ed2

Browse files
authored
Merge pull request #2 from Kotlin-Android-Open-Source/renovate/all-deps
chore(deps): update all dependencies
2 parents 0a668f5 + 9c25a9b commit aee6ed2

File tree

2 files changed

+20
-25
lines changed

2 files changed

+20
-25
lines changed

app/build.gradle

+18-24
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion 29
7-
buildToolsVersion "29.0.3"
6+
compileSdkVersion 31
7+
buildToolsVersion "31.0.0"
88

99
defaultConfig {
1010
applicationId "com.hoc081098.stateflowsample"
1111
minSdkVersion 23
12-
targetSdkVersion 29
12+
targetSdkVersion 31
1313
versionCode 1
1414
versionName "1.0"
1515

@@ -23,44 +23,38 @@ android {
2323
}
2424
}
2525

26-
// To inline the bytecode built with JVM target 1.8 into
27-
// bytecode that is being built with JVM target 1.6. (e.g. navArgs)
28-
29-
3026
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_1_8
32-
targetCompatibility JavaVersion.VERSION_1_8
27+
sourceCompatibility JavaVersion.VERSION_11
28+
targetCompatibility JavaVersion.VERSION_11
3329
}
3430
kotlinOptions {
35-
jvmTarget = "1.8"
36-
}
37-
viewBinding {
38-
enabled = true
31+
jvmTarget = JavaVersion.VERSION_11.toString()
3932
}
33+
buildFeatures { viewBinding true }
4034
}
4135

4236
dependencies {
4337
implementation fileTree(dir: 'libs', include: ['*.jar'])
4438
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
4539

46-
implementation 'androidx.appcompat:appcompat:1.1.0'
47-
implementation 'androidx.core:core-ktx:1.2.0'
48-
implementation 'com.google.android.material:material:1.1.0'
40+
implementation 'androidx.appcompat:appcompat:1.4.0'
41+
implementation 'androidx.core:core-ktx:1.7.0'
42+
implementation 'com.google.android.material:material:1.4.0'
4943
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
5044

5145
// viewModels
52-
implementation "androidx.fragment:fragment-ktx:1.2.4"
46+
implementation "androidx.fragment:fragment-ktx:1.4.0"
5347

54-
testImplementation 'junit:junit:4.13'
55-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
56-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
48+
testImplementation 'junit:junit:4.13.2'
49+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
50+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
5751

5852
// coroutines
59-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'
60-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'
53+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
54+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
6155

6256
// viewModelScope
63-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha02'
57+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
6458
// lifecycleScope
65-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha02'
59+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
6660
}

app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<activity
1313
android:name=".MainActivity"
1414
android:label="@string/app_name"
15-
android:theme="@style/AppTheme">
15+
android:theme="@style/AppTheme"
16+
android:exported="true">
1617
<intent-filter>
1718
<action android:name="android.intent.action.MAIN" />
1819

0 commit comments

Comments
 (0)