mirror of
https://github.com/ProtonVPN/android-app.git
synced 2026-03-13 09:02:15 +08:00
Upgraded Core to 9.8.0.
This commit is contained in:
Neil Marietta
committed by
Algirdas Pundzius
Algirdas Pundzius
parent
a5223edb3f
commit
3e608e4e2e
@@ -608,7 +608,7 @@ configurations {
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
|
||||
debugImplementation 'androidx.test.espresso.idling:idling-concurrent:3.4.0'
|
||||
debugImplementation 'androidx.test.espresso.idling:idling-concurrent:3.5.0'
|
||||
|
||||
debugImplementation 'com.squareup.leakcanary:leakcanary-object-watcher-android:2.9.1'
|
||||
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
|
||||
@@ -617,10 +617,10 @@ dependencies {
|
||||
detektPlugins project(":detekt-gitlab-output-plugin")
|
||||
detektPlugins project(":detekt-custom-rules")
|
||||
|
||||
implementation 'androidx.test.espresso:espresso-idling-resource:3.4.0'
|
||||
implementation 'androidx.test.espresso:espresso-idling-resource:3.5.0'
|
||||
implementation 'commons-codec:commons-codec:1.15'
|
||||
implementation 'com.github.moagrius:TileView:2.2.7'
|
||||
implementation 'com.google.android.material:material:1.6.1'
|
||||
implementation 'com.google.android.material:material:1.7.0'
|
||||
implementation 'com.jakewharton:butterknife:10.2.3'
|
||||
implementation 'com.google.code.gson:gson:2.8.9'
|
||||
implementation 'androidx.recyclerview:recyclerview:1.2.1'
|
||||
@@ -629,8 +629,8 @@ dependencies {
|
||||
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidx_lifecycle_version"
|
||||
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidx_lifecycle_version"
|
||||
implementation 'com.daimajia.easing:library:2.4@aar'
|
||||
implementation 'androidx.activity:activity-ktx:1.6.0'
|
||||
implementation 'androidx.fragment:fragment-ktx:1.5.3'
|
||||
implementation 'androidx.activity:activity-ktx:1.6.1'
|
||||
implementation 'androidx.fragment:fragment-ktx:1.5.5'
|
||||
implementation 'com.squareup:otto:1.3.8'
|
||||
implementation 'io.sentry:sentry-android:5.5.2'
|
||||
implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
|
||||
@@ -777,7 +777,7 @@ dependencies {
|
||||
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinx_coroutines_version"
|
||||
// debugImplementation as a workaround for ActivityScenario problem:
|
||||
// https://github.com/android/android-test/issues/940#issuecomment-934406022
|
||||
debugImplementation 'androidx.test:core:1.5.0-rc01'
|
||||
debugImplementation 'androidx.test:core:1.5.0'
|
||||
|
||||
testImplementation project(':shared-test-code')
|
||||
androidTestImplementation project(':shared-test-code')
|
||||
@@ -785,27 +785,27 @@ dependencies {
|
||||
androidTestImplementation 'com.squareup.okhttp3:okhttp-tls:4.9.1'
|
||||
|
||||
// AndroidJUnitRunner and JUnit Rules
|
||||
androidTestImplementation 'androidx.test:runner:1.5.0-rc01'
|
||||
androidTestImplementation 'androidx.test:rules:1.5.0-rc01'
|
||||
androidTestUtil 'androidx.test:orchestrator:1.4.1'
|
||||
androidTestUtil 'androidx.test.services:test-services:1.4.1'
|
||||
androidTestImplementation 'androidx.test:runner:1.5.0'
|
||||
androidTestImplementation 'androidx.test:rules:1.5.0'
|
||||
androidTestUtil 'androidx.test:orchestrator:1.4.2'
|
||||
androidTestUtil 'androidx.test.services:test-services:1.4.2'
|
||||
|
||||
// Assertions
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
|
||||
androidTestImplementation 'androidx.test.ext:truth:1.4.0'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
|
||||
androidTestImplementation 'androidx.test.ext:truth:1.5.0'
|
||||
androidTestImplementation 'com.google.truth:truth:1.1.3'
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test:1.6.10"
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.6.10"
|
||||
androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.6.10"
|
||||
androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.6.10"
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test:1.7.20"
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.7.20"
|
||||
androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.7.20"
|
||||
androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.7.20"
|
||||
|
||||
// Espresso dependencies
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.4.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-web:3.4.0'
|
||||
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.5.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-web:3.5.0'
|
||||
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0-alpha01'
|
||||
|
||||
implementation project(path: ':openvpn')
|
||||
}
|
||||
|
||||
@@ -74,6 +74,8 @@ class DynamicReportActivity : BaseActivityV2() {
|
||||
finishAndShowSuccessDialog()
|
||||
is ReportBugActivityViewModel.ViewState.Error ->
|
||||
binding.loadingContainer.switchToRetry(state.error)
|
||||
is ReportBugActivityViewModel.ViewState.SubmittingReport ->
|
||||
Unit
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -86,6 +86,7 @@ class InformationActivity : BaseActivityV2() {
|
||||
is InfoType.Generic -> setupGenericInfo()
|
||||
is InfoType.Streaming -> setupStreamingInfo(info.countryCode)
|
||||
is InfoType.Partners -> setupPartnershipInfo(info)
|
||||
null -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -67,6 +67,7 @@ import kotlinx.coroutines.test.advanceTimeBy
|
||||
import kotlinx.coroutines.test.advanceUntilIdle
|
||||
import kotlinx.coroutines.test.pauseDispatcher
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import kotlinx.coroutines.test.setMain
|
||||
import me.proton.core.network.domain.NetworkManager
|
||||
import me.proton.core.network.domain.session.SessionId
|
||||
@@ -207,7 +208,7 @@ class VpnConnectionManagerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `when fallback finishes wake lock is released`() = testScope.runBlockingTest {
|
||||
fun `when fallback finishes wake lock is released`() = runTest {
|
||||
// No servers triggers fallback connections
|
||||
serverManager.setServers(emptyList(), null)
|
||||
|
||||
|
||||
10
build.gradle
10
build.gradle
@@ -23,13 +23,13 @@ buildscript {
|
||||
// We should migrate to version catalogs as soon as IDE support is available:
|
||||
// https://issuetracker.google.com/issues/226078451
|
||||
ext.androidx_lifecycle_version = '2.5.1'
|
||||
ext.core_version = '9.7.1'
|
||||
ext.core_version = '9.8.0'
|
||||
ext.detekt_version = '1.19.0'
|
||||
ext.hilt_version = '2.44'
|
||||
ext.kotlin_version = '1.6.21'
|
||||
ext.hilt_version = '2.44.2'
|
||||
ext.kotlin_version = '1.7.20'
|
||||
ext.kotlinx_coroutines_version = '1.6.4'
|
||||
ext.kotlinx_serialization_json_version = '1.3.3'
|
||||
ext.mockk_version = '1.12.8'
|
||||
ext.kotlinx_serialization_json_version = '1.4.1'
|
||||
ext.mockk_version = '1.13.3'
|
||||
|
||||
repositories {
|
||||
maven { url "https://plugins.gradle.org/m2/" }
|
||||
|
||||
@@ -34,6 +34,6 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
implementation("io.gitlab.arturbosch.detekt:detekt-api:$detekt_version")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
|
||||
}
|
||||
|
||||
|
||||
@@ -193,9 +193,9 @@ dependencies {
|
||||
dependencies.add("uiImplementation", "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
|
||||
dependencies.add("uiImplementation", "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")
|
||||
*/
|
||||
testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30")
|
||||
testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20")
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("org.mockito:mockito-core:3.9.0")
|
||||
testImplementation("org.robolectric:robolectric:4.5.1")
|
||||
testImplementation("androidx.test:core:1.4.0")
|
||||
testImplementation("org.robolectric:robolectric:4.9.1")
|
||||
testImplementation("androidx.test:core:1.5.0")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user