From 696ab65c25f681d440584a1c58fa307a65d21bf2 Mon Sep 17 00:00:00 2001 From: murat aydin Date: Tue, 27 Sep 2022 12:19:01 +0200 Subject: [PATCH] Update dependencies --- app/build.gradle | 27 ++++++++++--------- app/src/main/AndroidManifest.xml | 2 +- .../dynamiccodeloading/MainActivity.kt | 4 +-- build.gradle | 8 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- storage/build.gradle | 9 +++---- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b143b08..5e90e5a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,11 +4,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { applicationId "com.google.android.samples.dynamiccodeloading" - minSdkVersion 21 - targetSdkVersion 28 + minSdkVersion 25 + targetSdkVersion 33 versionCode 33 versionName "1.0.33" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -51,18 +51,19 @@ dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - api 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.core:core-ktx:1.0.1' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + api 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation "com.google.android.play:core:1.4.1" + implementation "com.google.android.play:core:1.10.3" - daggerApi 'com.google.dagger:dagger:2.16' - api 'com.google.dagger:dagger-android-support:2.16' + daggerApi 'com.google.dagger:dagger:2.43.1' + api 'com.google.dagger:dagger-android-support:2.43.1' - kapt 'com.google.dagger:dagger-compiler:2.16' + kapt 'com.google.dagger:dagger-compiler:2.43.1' - implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha04' - androidTestImplementation 'androidx.test:rules:1.2.0-alpha04' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + androidTestImplementation 'androidx.test:rules:1.4.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 33357af..11ca05c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="AllowBackup,GoogleAppIndexingWarning"> - + diff --git a/app/src/main/java/com/google/android/samples/dynamiccodeloading/MainActivity.kt b/app/src/main/java/com/google/android/samples/dynamiccodeloading/MainActivity.kt index 85a1d0c..102a6e2 100644 --- a/app/src/main/java/com/google/android/samples/dynamiccodeloading/MainActivity.kt +++ b/app/src/main/java/com/google/android/samples/dynamiccodeloading/MainActivity.kt @@ -21,7 +21,7 @@ import android.widget.Button import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider /** * The single, main activity of this sample. @@ -48,7 +48,7 @@ class MainActivity : AppCompatActivity() { saveText = findViewById(R.id.saveText) saveButton = findViewById(R.id.saveButton) - viewModel = ViewModelProviders.of(this).get(MainViewModel::class.java) + viewModel = ViewModelProvider(this).get(MainViewModel::class.java) incrementButton.setOnClickListener { viewModel.incrementCounter() diff --git a/build.gradle b/build.gradle index e89c4bd..43ccd1a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,18 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.30' + ext.kotlin_version = '1.7.10' repositories { maven { - url "http://storage.googleapis.com/r8-releases/raw/master" + url "https://storage.googleapis.com/r8-releases/raw/master" } google() jcenter() } dependencies { - classpath 'com.android.tools:r8:878ec25559ca91497517345ec3a6c16102b7025c' // Must be before the Gradle Plugin for Android. - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools:r8:3.3.75' // Must be before the Gradle Plugin for Android. + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1aa8bf9..8796cbd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/storage/build.gradle b/storage/build.gradle index 15ec4e1..c13e015 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -3,13 +3,10 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { - minSdkVersion 21 - targetSdkVersion 28 - versionCode 1 - versionName "1.0" + minSdkVersion 25 } buildTypes { @@ -44,5 +41,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') - kapt 'com.google.dagger:dagger-compiler:2.16' + kapt 'com.google.dagger:dagger-compiler:2.43.1' }