feat: remove no longer needed sftp javadoc uploads + update dependencies

ScreamingSandals · Dec 20, 2024 · c3e4709 · c3e4709
1 parent b07a520
commit c3e4709
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 224 deletions.
diff --git a/builder/build.gradle.kts b/builder/build.gradle.kts
@@ -1,5 +1,4 @@
 dependencies {
-    implementation(libs.jsch)
     implementation(libs.licenser)
     implementation(libs.shadow)
 }

diff --git a/builder/src/main/java/org/screamingsandals/gradle/builder/Constants.java b/builder/src/main/java/org/screamingsandals/gradle/builder/Constants.java
@@ -26,9 +26,4 @@ private Constants() {
     public static final @NotNull String NEXUS_URL_RELEASE_PROPERTY = "NEXUS_URL_RELEASE";
     public static final @NotNull String NEXUS_USERNAME_PROPERTY = "NEXUS_USERNAME";
     public static final @NotNull String NEXUS_PASSWORD_PROPERTY = "NEXUS_PASSWORD";
-
-    public static final @NotNull String JAVADOC_HOST_PROPERTY = "JAVADOC_HOST";
-    public static final @NotNull String JAVADOC_USER_PROPERTY = "JAVADOC_USER";
-    public static final @NotNull String JAVADOC_SECRET_PROPERTY = "JAVADOC_SECRET";
-    public static final @NotNull String JAVADOC_UPLOAD_CUSTOM_DIRECTORY_PATH_PROPERTY = "JavadocUploadCustomDirectoryPath";
 }
diff --git a/builder/src/main/java/org/screamingsandals/gradle/builder/JavadocUtilities.java b/builder/src/main/java/org/screamingsandals/gradle/builder/JavadocUtilities.java
@@ -21,8 +21,6 @@
 import org.gradle.api.tasks.javadoc.Javadoc;
 import org.gradle.external.javadoc.CoreJavadocOptions;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.screamingsandals.gradle.builder.tasks.JavadocUploadTask;
 
 public final class JavadocUtilities {
     private JavadocUtilities() {
@@ -39,46 +37,10 @@ public static void configureJavadocTasks(@NotNull Project project) {
             });
         });
 
-        project.getTasks().create("javadocJar", Jar.class, it -> {
+        project.getTasks().register("javadocJar", Jar.class, it -> {
             it.dependsOn(task);
             it.getArchiveClassifier().set("javadoc");
             it.from(task);
         });
     }
-
-    public static void setupAllowJavadocUploadTask(@NotNull Project project) {
-        project.getTasks().create("allowJavadocUpload", it -> {
-            if (project.getTasks().findByName("uploadJavadoc") != null) {
-                it.dependsOn("uploadJavadoc");
-            }
-        });
-    }
-
-    public static void setupSftpJavadocPublishingTaskFromProperties(@NotNull Project project) {
-        if (System.getenv(Constants.JAVADOC_HOST_PROPERTY) != null
-                && System.getenv(Constants.JAVADOC_USER_PROPERTY) != null
-                && System.getenv(Constants.JAVADOC_SECRET_PROPERTY) != null
-        ) {
-            setupSftpJavadocPublishingTask(
-                    project,
-                    System.getenv(Constants.JAVADOC_HOST_PROPERTY),
-                    System.getenv(Constants.JAVADOC_USER_PROPERTY),
-                    System.getenv(Constants.JAVADOC_SECRET_PROPERTY),
-                    System.getenv(Constants.JAVADOC_UPLOAD_CUSTOM_DIRECTORY_PATH_PROPERTY)
-            );
-        }
-    }
-
-    public static void setupSftpJavadocPublishingTask(@NotNull Project project, @NotNull String javadocHost, @NotNull String javadocUser, @NotNull String javadocPassword, @Nullable String customDirectoryPath) {
-        if (project.getTasks().findByName("javadoc") == null) {
-            throw new IllegalStateException("Please call configureJavadocTasks() first!");
-        }
-
-        project.getTasks().register("uploadJavadoc", JavadocUploadTask.class, it -> {
-            it.getSftpHost().set(javadocHost);
-            it.getSftpUser().set(javadocUser);
-            it.getSftpPassword().set(javadocPassword);
-            it.getJavaDocCustomDirectoryPath().set(customDirectoryPath);
-        });
-    }
 }
diff --git a/builder/src/main/java/org/screamingsandals/gradle/builder/tasks/JavadocUploadTask.java b/builder/src/main/java/org/screamingsandals/gradle/builder/tasks/JavadocUploadTask.java
diff --git a/builder/src/main/java/org/screamingsandals/gradle/builder/tasks/SftpUploadTask.java b/builder/src/main/java/org/screamingsandals/gradle/builder/tasks/SftpUploadTask.java
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,17 @@
 [versions]
-shadow = "8.1.7"
-jsch = "0.1.55"
-gson = "2.10.1"
+shadow = "8.3.5"
+gson = "2.11.0"
 licenser = "0.6.1"
-jetbrains-annotations = "24.1.0"
+jetbrains-annotations = "26.0.1"
 
 # compile only
-projectlombok = "1.18.32"
-kotlin = "1.9.10"
+projectlombok = "1.18.36"
+kotlin = "2.1.0"
 
 [libraries]
-shadow = { group = "io.github.goooler.shadow", name = "shadow-gradle-plugin", version.ref = "shadow" }
+shadow = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }
 licenser = { group = "gradle.plugin.org.cadixdev.gradle", name = "licenser", version.ref = "licenser" }
 gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
-jsch = { group = "com.jcraft", name = "jsch", version.ref = "jsch" }
 jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
 projectlombok = { group = "org.projectlombok", name = "lombok", version.ref = "projectlombok" }
 kotlin-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists