Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit a82164b

Browse files
committed
fix(common): allow editing init script
1 parent fac8ac6 commit a82164b

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

.idea/compiler.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/app/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import com.itsaky.androidide.build.config.BuildConfig
2121
import com.itsaky.androidide.desugaring.utils.JavaIOReplacements.applyJavaIOReplacements
2222
import com.itsaky.androidide.plugins.AndroidIDEAssetsPlugin
2323

24-
2524
plugins {
2625
id("com.itsaky.androidide.core-app")
2726
id("com.android.application")
@@ -43,8 +42,6 @@ buildscript {
4342
}
4443
}
4544

46-
47-
4845
android {
4946
namespace = BuildConfig.packageName
5047

core/common/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ plugins {
2323
id("kotlin-android")
2424
}
2525

26-
27-
2826
android {
2927
namespace = "${BuildConfig.packageName}.common"
3028
}

core/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,30 @@
1818
package com.itsaky.androidide.managers;
1919

2020
import androidx.annotation.NonNull;
21-
import com.blankj.utilcode.util.FileIOUtils;
21+
2222
import com.blankj.utilcode.util.FileUtils;
2323
import com.blankj.utilcode.util.ResourceUtils;
2424
import com.itsaky.androidide.app.BaseApplication;
2525
import com.itsaky.androidide.app.configuration.IDEBuildConfigProvider;
2626
import com.itsaky.androidide.app.configuration.IJdkDistributionProvider;
2727
import com.itsaky.androidide.utils.Environment;
28+
29+
import org.jetbrains.annotations.Contract;
30+
import org.slf4j.Logger;
31+
import org.slf4j.LoggerFactory;
32+
2833
import java.io.File;
2934
import java.io.FileReader;
3035
import java.io.IOException;
3136
import java.io.InputStreamReader;
3237
import java.io.Reader;
38+
import java.nio.charset.StandardCharsets;
3339
import java.util.Arrays;
3440
import java.util.Properties;
3541
import java.util.concurrent.CompletableFuture;
42+
3643
import kotlin.io.ConstantsKt;
3744
import kotlin.io.FilesKt;
38-
import org.jetbrains.annotations.Contract;
39-
import org.slf4j.Logger;
40-
import org.slf4j.LoggerFactory;
4145

4246
public class ToolsManager {
4347

@@ -202,10 +206,14 @@ private static void extractToolingApi() {
202206
}
203207

204208
private static void writeInitScript() {
205-
if (Environment.INIT_SCRIPT.exists()) {
206-
FileUtils.delete(Environment.INIT_SCRIPT);
209+
final var initScript = Environment.INIT_SCRIPT;
210+
final var initScriptBak = new File(initScript.getParentFile(), initScript.getName() + ".bak");
211+
final var contents = readInitScript();
212+
213+
FilesKt.writeText(initScriptBak, contents, StandardCharsets.UTF_8);
214+
if (!initScript.exists()) {
215+
FilesKt.writeText(initScript, contents, StandardCharsets.UTF_8);
207216
}
208-
FileIOUtils.writeFileFromString(Environment.INIT_SCRIPT, readInitScript());
209217
}
210218

211219
@NonNull

0 commit comments

Comments
 (0)