Merge branch 'upstream' into mapping-io

1 files changed, 6 insertions, 11 deletions

diff --git a/build.gradle b/build.gradle
index 8cbe0cd6..b89f1b59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
         id 'maven-publish'
+        id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 subprojects {
@@ -7,9 +8,6 @@ subprojects {
         apply plugin: 'maven-publish'
         apply plugin: 'checkstyle'
 
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-
         repositories {
                 mavenLocal()
                 mavenCentral()
@@ -17,8 +15,8 @@ subprojects {
         }
 
         dependencies {
-                implementation 'com.google.guava:guava:30.1.1-jre'
-                implementation 'com.google.code.gson:gson:2.8.7'
+                implementation 'com.google.guava:guava:32.1.2-jre'
+                implementation 'com.google.code.gson:gson:2.10.1'
                 implementation 'net.fabricmc:mapping-io:0.5.0'
                 
                 compileOnly 'org.jetbrains:annotations:24.0.1'
@@ -32,13 +30,10 @@ subprojects {
 
         version = version + (System.getenv("GITHUB_ACTIONS") ? "" : "+local")
 
-        task sourcesJar(type: Jar, dependsOn: classes) {
-                classifier = 'sources'
-                from sourceSets.main.allSource
-        }
-
         java {
                 withSourcesJar()
+                sourceCompatibility = JavaVersion.VERSION_17
+                targetCompatibility = JavaVersion.VERSION_17
         }
 
         tasks.withType(JavaCompile).configureEach {
@@ -49,7 +44,7 @@ subprojects {
 
         checkstyle {
                 configFile = rootProject.file('checkstyle.xml')
-                toolVersion = '10.3.3'
+                toolVersion = '10.12.4'
         }
 
         publishing {