Merge pull request #338 from ClubObsidian/fix/publishing

Attempt to fix maven publishing
ClubObsidian · Nov 24, 2023 · 41ccd16 · 41ccd16
2 parents 25d2b57 + d87fcc0
commit 41ccd16
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'java'
+    id 'java-library'
 }
 
 dependencies {

diff --git a/build.gradle b/build.gradle
@@ -28,24 +28,33 @@ subprojects {
 	apply plugin: 'org.cadixdev.licenser'
 	apply plugin: 'maven-publish'
 
+	java {
+		toolchain {
+			languageVersion = JavaLanguageVersion.of(11)
+		}
+		withJavadocJar()
+		withSourcesJar()
+	}
+
+	javadoc {
+		if(JavaVersion.current().isJava9Compatible()) {
+			options.addBooleanOption('html5', true)
+		}
+	}
+
 	publishing {
 		publications {
-			shadow(MavenPublication) {
+			mavenJava(MavenPublication) {
 				groupId projectGroup
 				artifactId project.name
 				version projectVersion
-				artifact shadowJar
+				artifact jar
+				artifact javadocJar
+				artifact sourcesJar
 			}
 		}
 	}
 
-	java {
-		toolchain {
-			languageVersion = JavaLanguageVersion.of(11)
-		}
-		withJavadocJar()
-	}
-
 	license {
 		header = project.rootProject.file('HEADER.txt')
 		include '**/*.java'