Skip to content

Commit 5f136fa

Browse files
committed
* dependencies update
* fixed potential memory leak
1 parent 8a3d8b0 commit 5f136fa

File tree

6 files changed

+12
-21
lines changed

6 files changed

+12
-21
lines changed

app/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ plugins {
55
}
66

77
android {
8-
compileSdkVersion 30
9-
buildToolsVersion "30.0.3"
8+
compileSdkVersion 31
109

1110
defaultConfig {
1211
applicationId "ru.otus.daggerhomework"
1312
minSdkVersion 23
14-
targetSdkVersion 30
13+
targetSdkVersion 31
1514
versionCode 1
1615
versionName "1.0"
1716

@@ -39,6 +38,6 @@ dependencies {
3938
implementation 'androidx.appcompat:appcompat:1.3.1'
4039
implementation 'com.google.android.material:material:1.4.0'
4140
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
42-
implementation 'com.google.dagger:dagger:2.38.1'
43-
kapt 'com.google.dagger:dagger-compiler:2.38.1'
41+
implementation 'com.google.dagger:dagger:2.42'
42+
kapt 'com.google.dagger:dagger-compiler:2.42'
4443
}

app/src/main/java/ru/otus/daggerhomework/MainActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity
44
import android.os.Bundle
55

66
class MainActivity : AppCompatActivity() {
7+
78
override fun onCreate(savedInstanceState: Bundle?) {
89
super.onCreate(savedInstanceState)
910
setContentView(R.layout.activity_main)

app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package ru.otus.daggerhomework
22

3-
import android.app.Activity
43
import android.content.Context
54
import android.widget.Toast
65
import androidx.fragment.app.FragmentActivity
7-
import androidx.lifecycle.ViewModel
8-
import java.lang.RuntimeException
96

107
class ViewModelProducer(
118
private val colorGenerator: ColorGenerator,
129
private val context: Context
13-
) : ViewModel() {
10+
) {
1411

1512
fun generateColor() {
1613
if (context !is FragmentActivity) throw RuntimeException("Здесь нужен контекст активити")

app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@ package ru.otus.daggerhomework
33
import android.app.Application
44
import android.content.Context
55
import android.widget.Toast
6-
import androidx.fragment.app.FragmentActivity
7-
import androidx.lifecycle.ViewModel
8-
import java.lang.RuntimeException
96

107
class ViewModelReceiver(
118
private val context: Context
12-
) : ViewModel() {
9+
) {
1310

1411
fun observeColors() {
1512
if (context !is Application) throw RuntimeException("Здесь нужен контекст апликейшена")

build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = "1.4.32"
3+
ext.kotlin_version = "1.6.21"
44
repositories {
5+
mavenCentral()
56
google()
6-
jcenter()
77
}
88
dependencies {
9-
classpath "com.android.tools.build:gradle:4.1.2"
9+
classpath "com.android.tools.build:gradle:7.0.4"
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
12-
// NOTE: Do not place your application dependencies here; they belong
13-
// in the individual module build.gradle files
1411
}
1512
}
1613

1714
allprojects {
1815
repositories {
16+
mavenCentral()
1917
google()
20-
jcenter()
2118
}
2219
}
2320

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip

0 commit comments

Comments
 (0)