Studio/AndroidIDE
5
0
Fork 0
mirror of https://gitee.com/zhangsken/AndroidIDE.git synced 2026-10-16 07:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(common): allow editing init script

Browse Source
This commit is contained in:
Akash Yadav
2024-08-26 20:14:45 +05:30
parent fac8ac61e1
commit a82164bd13
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/compiler.xml
Generated
+2
View File
@@ -256,6 +256,7 @@
<module name="AndroidIDE.testing.android" target="17" />
<module name="AndroidIDE.testing.android.test" target="11" />
<module name="AndroidIDE.testing.benchmark" target="17" />
<module name="AndroidIDE.testing.benchmarks-manual" target="17" />
<module name="AndroidIDE.testing.common" target="11" />
<module name="AndroidIDE.testing.common.main" target="11" />
<module name="AndroidIDE.testing.common.test" target="11" />
@@ -271,6 +272,7 @@
<module name="AndroidIDE.treesitter.test" target="1.7" />
<module name="AndroidIDE.treeview" target="17" />
<module name="AndroidIDE.uidesigner" target="17" />
<module name="AndroidIDE.utilities.level-hash" target="17" />
<module name="AndroidIDE.xml-inflater" target="17" />
<module name="AndroidIDE.xml.resources-api.test" target="11" />
<module name="AndroidIDE.xml.resources-indexing" target="17" />
core/app/build.gradle.kts
-3
View File
@@ -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
core/common/build.gradle.kts
-2
View File
@@ -23,8 +23,6 @@ plugins {
id("kotlin-android")
}
android {
namespace = "${BuildConfig.packageName}.common"
}
core/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
+15 -7
View File
@@ -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