From aa57ad8adba837370277f4626bc3c2efed3bcf54 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 20 Sep 2019 16:20:58 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- app/src/main/java/com/tangem/ui/fragment/MainFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt index c25244089f..ecfff929d0 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt @@ -11,6 +11,7 @@ import android.widget.PopupMenu import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf +import androidx.lifecycle.ViewModelProviders import com.tangem.App import com.tangem.Constant import com.tangem.data.Logger @@ -85,7 +86,7 @@ class MainFragment : BaseFragment(), NavigationResultListener, NfcAdapter.Reader override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) -// viewModel = ViewModelProviders.of(this).get(MainViewModel::class.java) + viewModel = ViewModelProviders.of(this).get(MainViewModel::class.java) // // // show snackbar about new version app // viewModel.getVersionName().observe(this, Observer { text -> From 9f505f7bd472de702827b11b6578ef309f9fb5d2 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 20 Sep 2019 16:27:59 +0300 Subject: [PATCH 2/2] Updated on 2026-08-14 --- build.gradle | 4 ++-- server-android/build.gradle | 10 +++++----- tangem-sdk/build.gradle | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 5c3241212c..7203774fc1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '1.3.50' repositories { google() jcenter() @@ -9,7 +9,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath 'io.fabric.tools:gradle:1.27.1' + classpath 'io.fabric.tools:gradle:1.31.0' } } diff --git a/server-android/build.gradle b/server-android/build.gradle index c194ede904..37632174bb 100644 --- a/server-android/build.gradle +++ b/server-android/build.gradle @@ -33,14 +33,14 @@ dependencies { implementation project(':tangem-card') // implementation 'com.github.TangemCash.card_android-common:card_android-android:0.1.0' - implementation 'androidx.appcompat:appcompat:1.1.0-alpha04' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.squareup.retrofit2:converter-gson:2.5.0' - implementation 'com.squareup.retrofit2:retrofit:2.5.0' + implementation 'com.squareup.retrofit2:converter-gson:2.6.0' + implementation 'com.squareup.retrofit2:retrofit:2.6.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { diff --git a/tangem-sdk/build.gradle b/tangem-sdk/build.gradle index 2f7a51eb93..5471f31c0c 100644 --- a/tangem-sdk/build.gradle +++ b/tangem-sdk/build.gradle @@ -40,12 +40,12 @@ dependencies { implementation project(':tangem-card') // implementation 'com.github.TangemCash.card_android-common:card_android-android:0.1.0' - implementation 'androidx.appcompat:appcompat:1.1.0-rc01' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' - implementation "androidx.lifecycle:lifecycle-runtime:2.0.0" - implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0" - implementation 'androidx.appcompat:appcompat:1.1.0-rc01' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' + implementation "androidx.lifecycle:lifecycle-runtime:2.1.0" + implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0" + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.scottyab:rootbeer-lib:0.0.7' testImplementation 'junit:junit:4.12'