fix impl class for Kotlin and Java library, fix errors

noel-archive · Feb 17, 2023 · 9b81ef8 · 9b81ef8
1 parent 9510c99
commit 9b81ef8
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,6 @@ import java.io.StringReader
 import java.util.Properties
 
 plugins {
-    id("com.gradle.plugin-publish")
     id("com.diffplug.spotless")
 
     `java-gradle-plugin`
@@ -74,6 +73,8 @@ spotless {
 }
 
 gradlePlugin {
+    isAutomatedPublishing = false
+
     @Suppress("UnstableApiUsage")
     vcsUrl by "https://github.com/Noelware/gradle-infra"
 
@@ -91,12 +92,12 @@ gradlePlugin {
         }
 
         create("kotlin-library") {
-            implementationClass = "org.noelware.infra.gradle.plugins.module.KotlinLibraryPlugin"
+            implementationClass = "org.noelware.infra.gradle.plugins.library.KotlinLibraryPlugin"
             id = "org.noelware.gradle.kotlin-library"
         }
 
         create("java-library") {
-            implementationClass = "org.noelware.infra.gradle.plugins.module.JavaLibraryPlugin"
+            implementationClass = "org.noelware.infra.gradle.plugins.library.JavaLibraryPlugin"
             id = "org.noelware.gradle.java-library"
         }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -29,13 +29,14 @@ plugins {
 
 repositories {
     maven("https://maven.floofy.dev/repo/releases")
+    maven("https://maven.noelware.org")
     gradlePluginPortal()
     mavenCentral()
 }
 
 dependencies {
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.15.0")
-    implementation("com.gradle.publish:plugin-publish-plugin:1.1.0")
+    implementation("org.noelware.gradle:gradle-infra-plugin:1.0.0")
     implementation("dev.floofy.commons:gradle:2.5.0")
     implementation(kotlin("gradle-plugin", "1.8.10"))
     implementation(gradleApi())

diff --git a/buildSrc/src/main/kotlin/Metadata.kt b/buildSrc/src/main/kotlin/Metadata.kt
@@ -26,5 +26,5 @@ package org.noelware.infra.gradle
 import org.gradle.api.JavaVersion
 import dev.floofy.utils.gradle.*
 
-val VERSION = Version(1, 0, 0, showPatchNumber = true)
+val VERSION = Version(1, 0, 1, showPatchNumber = true)
 val JAVA_VERSION = JavaVersion.VERSION_17
diff --git a/src/main/java/org/noelware/infra/gradle/plugins/library/JavaLibraryPlugin.java b/src/main/java/org/noelware/infra/gradle/plugins/library/JavaLibraryPlugin.java
@@ -44,6 +44,10 @@
 import org.noelware.infra.gradle.plugins.module.JavaModulePlugin;
 import org.noelware.infra.gradle.plugins.module.NoelwareModuleExtension;
 
+/**
+ * A plugin that is meant to be used with library projects. This configures the {@link JavaModulePlugin} alongside
+ * with this, but, this should be only for projects that are Java libraries.
+ */
 public class JavaLibraryPlugin implements Plugin<Project> {
     @Override
     public void apply(@NotNull Project project) {
@@ -150,7 +154,7 @@ public void apply(@NotNull Project project) {
 
             publishing.repositories((repositories) -> {
                 repositories.maven((maven) -> {
-                    maven.setUrl(ext.getS3BucketUrl().get());
+                    maven.setUrl(ext.getS3BucketUrl().getOrElse("s3://august/noelware/maven"));
                     maven.credentials(AwsCredentials.class, (creds) -> {
                         creds.setAccessKey(publishingProps.getProperty("s3.accessKey"));
                         creds.setSecretKey(publishingProps.getProperty("s3.secretKey"));

diff --git a/src/main/java/org/noelware/infra/gradle/plugins/library/KotlinLibraryPlugin.java b/src/main/java/org/noelware/infra/gradle/plugins/library/KotlinLibraryPlugin.java
@@ -40,12 +40,17 @@
 import org.gradle.jvm.tasks.Jar;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.dokka.gradle.AbstractDokkaTask;
+import org.noelware.infra.gradle.plugins.module.KotlinModulePlugin;
 import org.noelware.infra.gradle.plugins.module.NoelwareModuleExtension;
 
+/**
+ * A plugin that is meant to be used with library projects. This configures the {@link KotlinModulePlugin} alongside
+ * with this, but, this should be only for projects that are Kotlin libraries.
+ */
 public class KotlinLibraryPlugin implements Plugin<Project> {
     @Override
     public void apply(@NotNull Project project) {
-        project.getPlugins().apply(KotlinLibraryPlugin.class);
+        project.getPlugins().apply(KotlinModulePlugin.class);
         project.getPlugins().apply("java-library");
         project.getPlugins().apply("maven-publish");
         project.getPlugins().apply("org.jetbrains.dokka");
@@ -108,7 +113,7 @@ public void apply(@NotNull Project project) {
 
             publishing.repositories((repositories) -> {
                 repositories.maven((maven) -> {
-                    maven.setUrl(ext.getS3BucketUrl().get());
+                    maven.setUrl(ext.getS3BucketUrl().getOrElse("s3://august/noelware/maven"));
                     maven.credentials(AwsCredentials.class, (creds) -> {
                         creds.setAccessKey(publishingProps.getProperty("s3.accessKey"));
                         creds.setSecretKey(publishingProps.getProperty("s3.secretKey"));

diff --git a/src/main/java/org/noelware/infra/gradle/plugins/module/JavaModulePlugin.java b/src/main/java/org/noelware/infra/gradle/plugins/module/JavaModulePlugin.java
@@ -39,6 +39,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.noelware.infra.gradle.Licenses;
 
+/**
+ * Represents the base plugin for configuring Java projects.
+ */
 public class JavaModulePlugin implements Plugin<Project> {
     @Override
     public void apply(@NotNull Project project) {

diff --git a/src/main/java/org/noelware/infra/gradle/plugins/module/KotlinModulePlugin.java b/src/main/java/org/noelware/infra/gradle/plugins/module/KotlinModulePlugin.java
@@ -42,6 +42,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
 import org.noelware.infra.gradle.Licenses;
 
+/**
+ * Represents the base plugin for configuring Kotlin projects.
+ */
 public class KotlinModulePlugin implements Plugin<Project> {
     @Override
     public void apply(@NotNull Project project) {

diff --git a/src/main/resources/org.noelware.gradle.java-library.properties b/src/main/resources/org.noelware.gradle.java-library.properties
@@ -19,4 +19,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-implementation-class=org.noelware.infra.gradle.plugins.module.JavaLibraryPlugin
+implementation-class=org.noelware.infra.gradle.plugins.library.JavaLibraryPlugin
diff --git a/src/main/resources/org.noelware.gradle.kotlin-library.properties b/src/main/resources/org.noelware.gradle.kotlin-library.properties
@@ -19,4 +19,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-implementation-class=org.noelware.infra.gradle.plugins.module.KotlinLibraryPlugin
+implementation-class=org.noelware.infra.gradle.plugins.library.KotlinLibraryPlugin