From 1b940e28412fc70106f430f23579d66e232b9e9e Mon Sep 17 00:00:00 2001 From: Jonatan Rhodin Date: Thu, 12 Dec 2024 12:24:02 +0100 Subject: [PATCH] Remove maybenot_machines --- android/app/build.gradle.kts | 6 ++---- android/app/src/main/assets/maybenot_machines | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 120000 android/app/src/main/assets/maybenot_machines diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index f54041d7b208..832b0c13cb28 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -20,11 +20,9 @@ plugins { } val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath -val assetsDirectory = layout.projectDirectory.dir("src/main/assets") val extraAssetsDirectory = layout.buildDirectory.dir("extraAssets").get() val relayListPath = extraAssetsDirectory.file("relays.json").asFile val defaultChangelogAssetsDirectory = "$repoRootPath/android/src/main/play/release-notes/" -val rustJniLibs = layout.buildDirectory.dir("rustJniLibs/android").get() val credentialsPath = "${rootProject.projectDir}/credentials" val keystorePropertiesFile = file("$credentialsPath/keystore.properties") @@ -131,7 +129,7 @@ android { gradleLocalProperties(rootProject.projectDir, providers) .getOrDefault("OVERRIDE_CHANGELOG_DIR", defaultChangelogAssetsDirectory) - assets.srcDirs(assetsDirectory, extraAssetsDirectory, changelogDir) + assets.srcDirs(extraAssetsDirectory, changelogDir) } } @@ -314,7 +312,7 @@ tasks.register("generateRelayList") { // Create file if needed File("$extraAssetsDirectory").mkdirs() File("$extraAssetsDirectory/relays.json").createNewFile() - FileOutputStream("$assetsDirectory/relays.json").use { it.write(output.toByteArray()) } + FileOutputStream("$extraAssetsDirectory/relays.json").use { it.write(output.toByteArray()) } // Old ensure exists tasks if (!relayListPath.exists()) { diff --git a/android/app/src/main/assets/maybenot_machines b/android/app/src/main/assets/maybenot_machines deleted file mode 120000 index 62ac6876aac9..000000000000 --- a/android/app/src/main/assets/maybenot_machines +++ /dev/null @@ -1 +0,0 @@ -../../../../../dist-assets/maybenot_machines \ No newline at end of file