diff --git a/build.gradle b/build.gradle index 3e8a7f32..79f92f0a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,6 @@ buildscript { } } plugins { - // https://imperceptiblethoughts.com/shadow/introduction/ - id 'com.github.johnrengelman.shadow' version '6.1.0' id "org.sonarqube" version "3.0" id 'java' } @@ -58,11 +56,7 @@ repositories { } configurations { - shade { - transitive = false - } - - implementation.extendsFrom shade + implementation.extendsFrom reobfJar } def timestamp = "${use_timestamp}".toString() == "true" ? LocalDateTime.now().format("-YYYY-MM-dd.A").toString() : "" @@ -201,9 +195,6 @@ dependencies { runtimeOnly fg.deobf("me.djtheredstoner:DevAuth-${devauth_module}:${devauth_version}") implementation fg.deobf("curse.maven:${project.configured}") - - implementation "com.h2database:h2-mvstore:${project.h2_version}" - shade "com.h2database:h2-mvstore:${project.h2_version}" } mixin { @@ -271,30 +262,7 @@ sonarqube { } reobf { - shadowJar {} -} - -def relocate(origin) { - shadowJar.relocate(origin, "aeronicamc.libs.mxtune.shadow.$origin") -} - -shadowJar { - preserveFileTimestamps = false - reproducibleFileOrder = true - archiveClassifier = '' - configurations = [project.configurations.shade] - relocate 'org.h2' - exclude 'META-INF/maven/**' - exclude 'META-INF/proguard/**' - exclude 'META-INF/services/**' - exclude 'META-INF/LICENSE*' - exclude 'META-INF/NOTICE*' - exclude 'META-INF/versions/**' - exclude 'module-info.class' - exclude 'LICENSE' - - finalizedBy 'reobfShadowJar' - assemble.dependsOn shadowJar + jar {} } // Example configuration to allow publishing using the maven-publish task diff --git a/gradle.properties b/gradle.properties index 80e8f43b..0153fe47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,8 +23,6 @@ devauth_module=forge-latest devauth_version=1.1.2 devauth_enabled=true -### Libraries -h2_version=2.0.206 #sonarqube branch_name=1.16.5