diff --git a/.updater/version b/.updater/version new file mode 100644 index 00000000..9b942c64 --- /dev/null +++ b/.updater/version @@ -0,0 +1 @@ +56e7f9e6a139b4d01adf97a3f0670c945afd9b3e \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index e64528a2..be1f5d43 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,3 +1,5 @@ +import java.util.regex.Pattern + dependencies { compileOnly "com.github.Anuken.Arc:arc-core:$rootProject.arcVersion" compileOnly "com.github.Anuken.$rootProject.mindustryDependencyType:core:$rootProject.mindustryVersion" diff --git a/annotations/build.gradle b/annotations/build.gradle index b559b8ea..da521788 100644 --- a/annotations/build.gradle +++ b/annotations/build.gradle @@ -1,8 +1,6 @@ dependencies { implementation "com.github.Anuken.Arc:arc-core:$rootProject.arcVersion" implementation "com.github.Anuken.$rootProject.mindustryDependencyType:core:$rootProject.mindustryVersion" - - implementation 'com.squareup:javapoet:1.13.0' } tasks.withType(Jar) { diff --git a/build.gradle b/build.gradle index c60fef96..36d3628f 100644 --- a/build.gradle +++ b/build.gradle @@ -244,15 +244,18 @@ subprojects.each { Project project -> options.compilerArgs.addAll(['--release', '8']) options.generatedSourceOutputDirectory.set(project.file("gen")) options.forkOptions.jvmArgs.addAll([ - '--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.source.util=ALL-UNNAMED', - '--add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED' + "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED", + "--add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED" ]) targetCompatibility = 8 diff --git a/core/build.gradle b/core/build.gradle index c90633bf..cfe88603 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -2,13 +2,8 @@ dependencies { compileOnly "com.github.Anuken.Arc:arc-core:$rootProject.arcVersion" compileOnly "com.github.Anuken.$rootProject.mindustryDependencyType:core:$rootProject.mindustryVersion" - implementation "com.github.liplum:MultiCrafterLib:v1.7" - compileOnly project(":annotations") annotationProcessor project(":annotations") - - compileOnly "com.github.Zelaux.ZelauxModCore:annotations:74a5591c36b" - annotationProcessor "com.github.Zelaux.ZelauxModCore:annotations:74a5591c36b" } ext { diff --git a/desktop/build.gradle b/desktop/build.gradle index 8a168f38..3d9a5959 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -2,9 +2,6 @@ dependencies { compileOnly "com.github.Anuken.Arc:arc-core:$rootProject.arcVersion" compileOnly "com.github.Anuken.$rootProject.mindustryDependencyType:core:$rootProject.mindustryVersion" - compileOnly "com.github.Anuken.Arc:backend-sdl:$rootProject.arcVersion" - compileOnly "com.github.Anuken.Arc:natives-desktop:$rootProject.arcVersion" - implementation project(":core") compileOnly project(":annotations") diff --git a/sources.zip b/sources.zip new file mode 100644 index 00000000..9cdcbab4 Binary files /dev/null and b/sources.zip differ