diff options
| author | Ricki Hirner <hirner@bitfire.at> | 2020-04-13 14:31:39 +0300 |
|---|---|---|
| committer | Ricki Hirner <hirner@bitfire.at> | 2020-04-13 14:31:39 +0300 |
| commit | 4b88357652ca5f25665a906521d14c490026233c (patch) | |
| tree | 333b7e10969a92f5e14386e3419dbfc6dddfb958 | |
| parent | 791f78c2aa80baf7f6f786b3780e95b4de201b4e (diff) | |
Update dependencies
| -rw-r--r-- | build.gradle | 3 | ||||
| -rw-r--r-- | src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 8cb5884..bce2e93 100644 --- a/build.gradle +++ b/build.gradle @@ -74,8 +74,9 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.10' + androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.5.0' androidTestImplementation 'commons-io:commons-io:2.6' + //noinspection GradleDependency - commons-lang 3.10+ needs Java 8/Android 7 androidTestImplementation 'org.apache.commons:commons-lang3:3.9' testImplementation 'junit:junit:4.13' diff --git a/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt b/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt index 3e74e15..44d16b3 100644 --- a/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt +++ b/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt @@ -15,7 +15,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import at.bitfire.cert4android.databinding.ActivityTrustCertificateBinding import java.io.ByteArrayInputStream import java.security.MessageDigest @@ -40,7 +40,7 @@ class TrustCertificateActivity: AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - model = ViewModelProviders.of(this).get(Model::class.java) + model = ViewModelProvider(this).get(Model::class.java) model.processIntent(intent) val binding = DataBindingUtil.setContentView<ActivityTrustCertificateBinding>(this, R.layout.activity_trust_certificate) |