diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7b2ca4a83..533403524 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -256,6 +256,7 @@
+
@@ -271,6 +272,7 @@
+
diff --git a/core/app/build.gradle.kts b/core/app/build.gradle.kts
index 7028cdac9..ebf8c828b 100755
--- a/core/app/build.gradle.kts
+++ b/core/app/build.gradle.kts
@@ -21,7 +21,6 @@ import com.itsaky.androidide.build.config.BuildConfig
import com.itsaky.androidide.desugaring.utils.JavaIOReplacements.applyJavaIOReplacements
import com.itsaky.androidide.plugins.AndroidIDEAssetsPlugin
-
plugins {
id("com.itsaky.androidide.core-app")
id("com.android.application")
@@ -43,8 +42,6 @@ buildscript {
}
}
-
-
android {
namespace = BuildConfig.packageName
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
index 08d550276..17801b2b1 100755
--- a/core/common/build.gradle.kts
+++ b/core/common/build.gradle.kts
@@ -23,8 +23,6 @@ plugins {
id("kotlin-android")
}
-
-
android {
namespace = "${BuildConfig.packageName}.common"
}
diff --git a/core/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java b/core/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
index 733955bc8..c381497ef 100755
--- a/core/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
+++ b/core/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
@@ -18,26 +18,30 @@
package com.itsaky.androidide.managers;
import androidx.annotation.NonNull;
-import com.blankj.utilcode.util.FileIOUtils;
+
import com.blankj.utilcode.util.FileUtils;
import com.blankj.utilcode.util.ResourceUtils;
import com.itsaky.androidide.app.BaseApplication;
import com.itsaky.androidide.app.configuration.IDEBuildConfigProvider;
import com.itsaky.androidide.app.configuration.IJdkDistributionProvider;
import com.itsaky.androidide.utils.Environment;
+
+import org.jetbrains.annotations.Contract;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Properties;
import java.util.concurrent.CompletableFuture;
+
import kotlin.io.ConstantsKt;
import kotlin.io.FilesKt;
-import org.jetbrains.annotations.Contract;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ToolsManager {
@@ -202,10 +206,14 @@ public class ToolsManager {
}
private static void writeInitScript() {
- if (Environment.INIT_SCRIPT.exists()) {
- FileUtils.delete(Environment.INIT_SCRIPT);
+ final var initScript = Environment.INIT_SCRIPT;
+ final var initScriptBak = new File(initScript.getParentFile(), initScript.getName() + ".bak");
+ final var contents = readInitScript();
+
+ FilesKt.writeText(initScriptBak, contents, StandardCharsets.UTF_8);
+ if (!initScript.exists()) {
+ FilesKt.writeText(initScript, contents, StandardCharsets.UTF_8);
}
- FileIOUtils.writeFileFromString(Environment.INIT_SCRIPT, readInitScript());
}
@NonNull