Skip to content

Commit baff387

Browse files
Update Kotlin and android dependencies
2 parents 42cff81 + 6c4b09d commit baff387

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

app/build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ android {
4242
dependencies {
4343
implementation fileTree(dir: 'libs', include: ['*.jar'])
4444
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
45-
implementation 'androidx.appcompat:appcompat:1.1.0'
46-
implementation 'androidx.core:core-ktx:1.2.0'
47-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
48-
implementation 'androidx.preference:preference:1.1.0'
45+
implementation 'androidx.appcompat:appcompat:1.3.0'
46+
implementation 'androidx.core:core-ktx:1.5.0'
47+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
48+
implementation 'androidx.preference:preference-ktx:1.1.1'
4949
implementation 'org.tukaani:xz:1.8'
50-
implementation 'org.apache.commons:commons-compress:1.19'
50+
implementation 'org.apache.commons:commons-compress:1.20'
5151
implementation 'com.google.zxing:core:3.4.0'
5252
implementation 'me.dm7.barcodescanner:zxing:1.9.13'
53-
implementation 'com.google.android.material:material:1.1.0'
53+
implementation 'com.google.android.material:material:1.3.0'
5454
implementation "org.jetbrains.anko:anko-commons:0.10.4"
5555
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
5656

57-
testImplementation 'junit:junit:4.12'
58-
androidTestImplementation 'androidx.test:runner:1.2.0'
59-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
57+
testImplementation 'junit:junit:4.13.2'
58+
androidTestImplementation 'androidx.test:runner:1.3.0'
59+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
6060
}

app/src/main/java/com/lvaccaro/lamp/views/PowerImageView.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class PowerImageView: AppCompatImageView {
1010

1111
private var light = false
1212

13-
constructor(context: Context?): super(context)
14-
constructor(context: Context?, attrs: AttributeSet?): super(context, attrs)
15-
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
13+
constructor(context: Context?): super(context!!)
14+
constructor(context: Context?, attrs: AttributeSet?): super(context!!, attrs)
15+
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context!!, attrs, defStyleAttr)
1616

1717
fun on() {
1818
light = true

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.50'
4+
ext.kotlin_version = '1.4.31'
55
repositories {
66
google()
77
jcenter()
88

99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:4.1.1'
11+
classpath 'com.android.tools.build:gradle:4.2.1'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

+1-1
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-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

0 commit comments

Comments
 (0)