Skip to content

Commit

Permalink
Move JAXP to its own module
Browse files Browse the repository at this point in the history
Tested-by: Pranav Purwar <[email protected]>
Signed-off-by: PranavPurwar <[email protected]>
  • Loading branch information
PranavPurwar committed Sep 27, 2023
1 parent bb82168 commit d240f78
Show file tree
Hide file tree
Showing 20 changed files with 173 additions and 283 deletions.
14 changes: 14 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/copyright/cosmicide.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,11 @@
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission
android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission
android:name="android.permission.WRITE_SECURE_SETTINGS"
tools:ignore="ProtectedPermissions" />
Expand Down Expand Up @@ -77,14 +73,6 @@
android:resource="@xml/shortcuts" />
</activity>

<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
android:theme="@style/Theme.CosmicIde.Flamingo" />

<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
android:theme="@style/Theme.CosmicIde.Flamingo" />

<provider
android:name="rikka.shizuku.ShizukuProvider"
android:authorities="${applicationId}.shizuku"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/org/cosmicide/extension/editor.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fun CodeEditor.setFont() {
typefaceText = if (Prefs.editorFont.isNotEmpty()) {
Typeface.createFromFile(Prefs.editorFont)
} else {
ResourcesCompat.getFont(context, R.font.source_pro_regular)
ResourcesCompat.getFont(context, R.font.noto_sans_mono)
}
isHighlightCurrentLine = true
}
Expand All @@ -33,4 +33,4 @@ fun CodeEditor.setCompletionLayout() {
setAdapter(CustomCompletionItemAdapter())
setLayout(CustomCompletionLayout())
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class ProjectOutputFragment : BaseBindingFragment<FragmentCompileInfoBinding>()
System.setErr(systemOut)
System.setIn(EditorInputStream(binding.infoEditor))

val loader = MultipleDexClassLoader(classLoader = javaClass.classLoader)
val loader = MultipleDexClassLoader(classLoader = javaClass.classLoader!!)

loader.loadDex(project.binDir.resolve("classes.dex").apply { setReadOnly() })

Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/drawable/baseline_redo_24.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="?colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M18.4,10.6C16.6,9 14.2,8 11.5,8c-4.7,0 -8.6,3 1-0,7.2L3.9,16c1.1,-3.2 4.1,-5.5 7.6,-5.5 2,0 3.7,0.7 5.1,1.9L13,16h9V7l-3.6,3.6z" />
android:fillColor="?colorControlNormal"
android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z" />
</vector>
9 changes: 1 addition & 8 deletions feature/completion/java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@
* You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>.
*/

/*
* This file is part of Cosmic IDE.
* Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
* You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>.
*/

plugins {
id("com.android.library")
}
Expand All @@ -36,7 +29,7 @@ android {
}

dependencies {
implementation("androidx.annotation:annotation:1.6.0")
implementation("androidx.annotation:annotation:1.7.0")

implementation("com.google.code.gson:gson:2.10.1")
implementation("io.github.itsaky:nb-javac-android:17.0.0.3")
Expand Down
19 changes: 18 additions & 1 deletion feature/formatter/google-java-format/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,25 @@ java {
targetCompatibility = JavaVersion.VERSION_17
}

tasks.withType<JavaCompile> {
options.compilerArgs.addAll(
listOf(
"--add-exports",
"jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"--add-exports",
"jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-exports",
"jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports",
"jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"
)
)
}

dependencies {
implementation("com.google.guava:guava:32.1.2-jre")
implementation("io.github.itsaky:nb-javac-android:17.0.0.3")
api(files("libs/google-java-format-HEAD-20221027.232252-92.jar"))

implementation("com.google.auto.value:auto-value-annotations:1.10.4")
annotationProcessor("com.google.auto.value:auto-value:1.10.4")
}
Binary file not shown.
20 changes: 4 additions & 16 deletions feature/formatter/ktfmt/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
/*
* This file is part of Cosmic IDE.
* Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
* You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>.
*/

/*
* This file is part of Cosmic IDE.
* Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
* You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>.
*/

/*
* This file is part of Cosmic IDE.
* Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
Expand All @@ -23,10 +9,12 @@ plugins {
}

dependencies {
api(files("libs/ktfmt-0.41.jar"))
api("com.facebook:ktfmt:0.46") {
isTransitive = false
}
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
}
Binary file removed feature/formatter/ktfmt/libs/ktfmt-0.41.jar
Binary file not shown.

This file was deleted.

Loading

0 comments on commit d240f78

Please sign in to comment.