Skip to content

Commit dc4c14a

Browse files
committed
Bump versions for Bumblebee
Updated versions of: Kotlin, AGP and gradle compileSDK and targetSDK dependencies removed lines: id 'kotlin-android-extensions' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" import androidx.lifecycle.observe set up: android:exported="true" in Manifest
1 parent c21e621 commit dc4c14a

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

app/build.gradle

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ plugins {
2020
}
2121

2222
android {
23-
compileSdkVersion 30
23+
compileSdkVersion 32
2424

2525
defaultConfig {
2626
applicationId "com.codelab.android.datastore"
2727
minSdkVersion 16
28-
targetSdkVersion 30
28+
targetSdkVersion 32
2929
versionCode 1
3030
versionName "1.0"
3131

@@ -51,13 +51,11 @@ android {
5151

5252
dependencies {
5353

54-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
5554
implementation "androidx.appcompat:appcompat:$supportLibVersion"
5655
implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
5756
implementation "com.google.android.material:material:$materialVersion"
5857

5958
// kotlin
60-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
6159
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
6260
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
6361

app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
android:roundIcon="@mipmap/ic_launcher_round"
2626
android:supportsRtl="true"
2727
android:theme="@style/Theme.Datastore">
28-
<activity android:name=".ui.TasksActivity">
28+
<activity android:name=".ui.TasksActivity"
29+
android:exported="true">
2930
<intent-filter>
3031
<action android:name="android.intent.action.MAIN" />
3132

app/src/main/java/com/codelab/android/datastore/ui/TasksActivity.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package com.codelab.android.datastore.ui
1919
import android.os.Bundle
2020
import androidx.appcompat.app.AppCompatActivity
2121
import androidx.lifecycle.ViewModelProvider
22-
import androidx.lifecycle.observe
2322
import androidx.recyclerview.widget.DividerItemDecoration
2423
import com.codelab.android.datastore.data.SortOrder
2524
import com.codelab.android.datastore.data.TasksRepository
@@ -42,13 +41,13 @@ class TasksActivity : AppCompatActivity() {
4241
viewModel = ViewModelProvider(
4342
this,
4443
TasksViewModelFactory(TasksRepository, UserPreferencesRepository.getInstance(this))
45-
).get(TasksViewModel::class.java)
44+
)[TasksViewModel::class.java]
4645

4746
setupRecyclerView()
4847
setupFilterListeners(viewModel)
4948
setupSort()
5049

51-
viewModel.tasksUiModel.observe(owner = this) { tasksUiModel ->
50+
viewModel.tasksUiModel.observe(this) { tasksUiModel ->
5251
adapter.submitList(tasksUiModel.tasks)
5352
updateSort(tasksUiModel.sortOrder)
5453
binding.showCompletedSwitch.isChecked = tasksUiModel.showCompleted

build.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818
buildscript {
19-
ext.kotlin_version = "1.5.30"
19+
ext.kotlin_version = "1.6.10"
2020
repositories {
2121
google()
2222
mavenCentral()
2323
}
2424
dependencies {
25-
classpath 'com.android.tools.build:gradle:7.0.2'
25+
classpath 'com.android.tools.build:gradle:7.1.1'
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2727
}
2828
}
@@ -39,15 +39,15 @@ task clean(type: Delete) {
3939
}
4040

4141
ext {
42-
supportLibVersion = '1.3.1'
43-
constraintLayoutVersion = '2.1.0'
44-
coreVersion = '1.6.0'
45-
coroutinesVersion = '1.5.2'
46-
materialVersion = '1.4.0'
47-
lifecycleVersion = '2.3.1'
42+
supportLibVersion = '1.4.1'
43+
constraintLayoutVersion = '2.1.3'
44+
coreVersion = '1.7.0'
45+
coroutinesVersion = '1.6.0'
46+
materialVersion = '1.5.0'
47+
lifecycleVersion = '2.4.1'
4848

4949
runnerVersion = '1.4.0'
50-
rulesVersion = '1.0.1'
51-
junitVersion = '4.13.1'
50+
rulesVersion = '1.4.0'
51+
junitVersion = '4.13.2'
5252
espressoVersion = '3.4.0'
5353
}

0 commit comments

Comments
 (0)