diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-10-03 09:22:35 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-10-03 09:22:35 +0200 |
| commit | 1364302d5d02858150acf21d4e36f1501fd296e1 (patch) | |
| tree | df5c5bd6ee2296448eba0762b4a80370eb906ac8 /android/test | |
| parent | 50714d904e3fff7e74a1923e9118c32aa60737ff (diff) | |
| parent | d78b533b6c24d287531fa92d4825f70cdb1868e4 (diff) | |
| download | mullvadvpn-1364302d5d02858150acf21d4e36f1501fd296e1.tar.xz mullvadvpn-1364302d5d02858150acf21d4e36f1501fd296e1.zip | |
Merge branch 'upgrade-compiler-warnings-to-errors-droid-1301'
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/arch/build.gradle.kts | 5 | ||||
| -rw-r--r-- | android/test/common/build.gradle.kts | 5 | ||||
| -rw-r--r-- | android/test/e2e/build.gradle.kts | 5 | ||||
| -rw-r--r-- | android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt | 8 | ||||
| -rw-r--r-- | android/test/mockapi/build.gradle.kts | 5 |
5 files changed, 23 insertions, 5 deletions
diff --git a/android/test/arch/build.gradle.kts b/android/test/arch/build.gradle.kts index 085ad8d835..e84d725f87 100644 --- a/android/test/arch/build.gradle.kts +++ b/android/test/arch/build.gradle.kts @@ -17,7 +17,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts index 31b8cfa67a..ebb719bbbd 100644 --- a/android/test/common/build.gradle.kts +++ b/android/test/common/build.gradle.kts @@ -16,7 +16,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts index 8f4e9c2e0d..50224489d5 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -82,7 +82,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt index 3373691923..5e702a2d80 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt @@ -187,7 +187,13 @@ class SimpleMullvadHttpClient(context: Context) { } operator fun <T> JSONArray.iterator(): Iterator<T> = - (0 until this.length()).asSequence().map { this.get(it) as T }.iterator() + (0 until length()) + .asSequence() + .map { + @Suppress("UNCHECKED_CAST") + get(it) as T + } + .iterator() companion object { private const val REQUEST_ERROR_MESSAGE = diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts index 5a571bd4fc..166a389553 100644 --- a/android/test/mockapi/build.gradle.kts +++ b/android/test/mockapi/build.gradle.kts @@ -38,7 +38,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") |