diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index a016fad97e16..5e784b5d6904 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -324,9 +324,6 @@ jobs: name: relay-list path: android/app/build/extraAssets - - name: Copy maybenot machines to asset directory - run: cp dist-assets/maybenot_machines android/app/build/extraAssets/ - - name: Build app uses: burrunan/gradle-cache-action@v1 with: diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index f2a76b6d8d81..d62df346450f 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -19,7 +19,6 @@ plugins { val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath val extraAssetsDirectory = layout.buildDirectory.dir("extraAssets").get() val relayListPath = extraAssetsDirectory.file("relays.json").asFile -val maybenotMachinesFile = extraAssetsDirectory.file("maybenot_machines").asFile val defaultChangelogAssetsDirectory = "$repoRootPath/android/src/main/play/release-notes/" val extraJniDirectory = layout.buildDirectory.dir("extraJni").get() @@ -245,7 +244,6 @@ android { // Ensure all relevant assemble tasks depend on our ensure tasks. tasks["assemble$capitalizedVariantName"].apply { dependsOn(tasks["ensureRelayListExist"]) - dependsOn(tasks["ensureMaybenotMachinesExist"]) dependsOn(tasks["ensureJniDirectoryExist"]) dependsOn(tasks["ensureValidVersionCode"]) } @@ -288,14 +286,6 @@ tasks.register("ensureRelayListExist") { } } -tasks.register("ensureMaybenotMachinesExist") { - doLast { - if (!maybenotMachinesFile.exists()) { - throw GradleException("Missing maybenot machines: $maybenotMachinesFile") - } - } -} - tasks.register("ensureJniDirectoryExist") { doLast { if (!extraJniDirectory.asFile.exists()) { diff --git a/android/scripts/update-lockfile.sh b/android/scripts/update-lockfile.sh index e062fd08c352..e400caed72ae 100755 --- a/android/scripts/update-lockfile.sh +++ b/android/scripts/update-lockfile.sh @@ -22,7 +22,6 @@ GRADLE_TASKS=( EXCLUDED_GRADLE_TASKS=( "-xensureRelayListExist" "-xensureJniDirectoryExist" - "-xensureMaybenotMachinesExist" ) export GRADLE_OPTS diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index 55aa416e537b..458f592f1b85 100644 --- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -32,7 +32,6 @@ import org.koin.android.ext.android.getKoin import org.koin.core.context.loadKoinModules private const val RELAY_LIST_ASSET_NAME = "relays.json" -private const val MAYBENOT_MACHINES_ASSET_NAME = "maybenot_machines" class MullvadVpnService : TalpidVpnService() { @@ -224,7 +223,6 @@ class MullvadVpnService : TalpidVpnService() { private fun Context.prepareFiles() { extractAndOverwriteIfAssetMoreRecent(RELAY_LIST_ASSET_NAME) - extractAndOverwriteIfAssetMoreRecent(MAYBENOT_MACHINES_ASSET_NAME) } companion object { diff --git a/build-apk.sh b/build-apk.sh index 4f1162807585..da09e0647962 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -130,9 +130,6 @@ done echo "Updating relays.json..." cargo run --bin relay_list "${CARGO_ARGS[@]}" > android/app/build/extraAssets/relays.json -echo "Copying maybenot machines..." -cp dist-assets/maybenot_machines android/app/build/extraAssets/ - cd "$SCRIPT_DIR/android" $GRADLE_CMD --console plain "${GRADLE_TASKS[@]}" diff --git a/desktop/packages/mullvad-vpn/tasks/distribution.js b/desktop/packages/mullvad-vpn/tasks/distribution.js index c8282434bd55..48f5b79f337d 100644 --- a/desktop/packages/mullvad-vpn/tasks/distribution.js +++ b/desktop/packages/mullvad-vpn/tasks/distribution.js @@ -111,7 +111,6 @@ function newConfig() { { from: distAssets('uninstall_macos.sh'), to: './uninstall.sh' }, { from: buildAssets('shell-completions/_mullvad'), to: '.' }, { from: buildAssets('shell-completions/mullvad.fish'), to: '.' }, - { from: distAssets('maybenot_machines'), to: '.' }, ], }, @@ -208,7 +207,6 @@ function newConfig() { { from: distAssets(path.join('linux', 'apparmor_mullvad')), to: '.' }, { from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'openvpn')), to: '.' }, { from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'apisocks5')), to: '.' }, - { from: distAssets('maybenot_machines'), to: '.' }, ], },