deps: bump all

manusa · Apr 23, 2022 · 257cecc · 257cecc
1 parent c1a7a12
commit 257cecc
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@
 build
 !apis/openshift/src/model/java/com/marcnuri/yakc/model/com/github/openshift/api/build
 quickstarts/**/target
+**/tailwind.css
 
 *.iml
diff --git a/build.gradle b/build.gradle
@@ -4,8 +4,8 @@ import com.marcnuri.yakc.schema.model.ModelGeneratorTask
 plugins {
   id 'java-library'
   id 'jacoco'
-  id 'org.sonarqube' version '2.7'
-  id 'org.kordamp.gradle.jandex' version '0.8.0'
+  id 'org.sonarqube' version '3.3'
+  id 'org.kordamp.gradle.jandex' version '0.12.0'
 }
 
 apply from: 'shared.gradle'

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -11,8 +11,8 @@ java {
 
 dependencies {
   compileOnly gradleApi()
-  compileOnly "com.samskivert:jmustache:$version_mustache"
-  compileOnly "io.swagger.parser.v3:swagger-parser:$version_swagger_parser"
+  implementation "com.samskivert:jmustache:$version_mustache"
+  implementation "io.swagger.parser.v3:swagger-parser:$version_swagger_parser"
   compileOnly "org.projectlombok:lombok:$version_projectlombok"
   annotationProcessor "org.projectlombok:lombok:$version_projectlombok"
 }
diff --git a/buildSrc/src/main/java/com/marcnuri/yakc/schema/api/ApiGeneratorTask.java b/buildSrc/src/main/java/com/marcnuri/yakc/schema/api/ApiGeneratorTask.java
@@ -24,6 +24,9 @@
 import io.swagger.v3.parser.util.InlineModelResolver;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.File;
@@ -37,17 +40,12 @@
  * Created by Marc Nuri on 2020-04-05.
  */
 public class ApiGeneratorTask extends DefaultTask {
-  @Input
+
   public String packageName;
-  @Input
   public File[] schemas;
-  @Input
   public File templatesDir;
-  @Input
   public File outputDirectory;
-  @Input
   public String[] skipGenerationRegexes;
-  @Input
   public String[] includeGenerationRegexes;
 
   @TaskAction
@@ -81,4 +79,36 @@ private void generateApi(File schema) {
   public Path resolveSourceDirectory() {
     return outputDirectory.toPath().resolve("src").resolve("api").resolve("java");
   }
+
+  @Input
+  public String getPackageName() {
+    return packageName;
+  }
+
+  @InputFiles
+  public File[] getSchemas() {
+    return schemas;
+  }
+
+  @InputDirectory
+  public File getTemplatesDir() {
+    return templatesDir;
+  }
+
+  @InputDirectory
+  public File getOutputDirectory() {
+    return outputDirectory;
+  }
+
+  @Input
+  @org.gradle.api.tasks.Optional
+  public String[] getSkipGenerationRegexes() {
+    return skipGenerationRegexes;
+  }
+
+  @Input
+  @org.gradle.api.tasks.Optional
+  public String[] getIncludeGenerationRegexes() {
+    return includeGenerationRegexes;
+  }
 }
diff --git a/buildSrc/src/main/java/com/marcnuri/yakc/schema/model/ModelGeneratorTask.java b/buildSrc/src/main/java/com/marcnuri/yakc/schema/model/ModelGeneratorTask.java
@@ -24,6 +24,8 @@
 import io.swagger.v3.parser.OpenAPIV3Parser;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.File;
@@ -38,17 +40,11 @@
  */
 public class ModelGeneratorTask extends DefaultTask {
 
-  @Input
   public String packageName;
-  @Input
   public File[] schemas;
-  @Input
   public File templatesDir;
-  @Input
   public File outputDirectory;
-  @Input
   public String[] skipGenerationRegexes;
-  @Input
   public String[] includeGenerationRegexes;
 
   @TaskAction
@@ -82,4 +78,36 @@ private void generateModel(File schema) {
   public Path resolveSourceDirectory() {
     return outputDirectory.toPath().resolve("src").resolve("model").resolve("java");
   }
+
+  @Input
+  public String getPackageName() {
+    return packageName;
+  }
+
+  @InputFiles
+  public File[] getSchemas() {
+    return schemas;
+  }
+
+  @InputDirectory
+  public File getTemplatesDir() {
+    return templatesDir;
+  }
+
+  @InputDirectory
+  public File getOutputDirectory() {
+    return outputDirectory;
+  }
+
+  @Input
+  @org.gradle.api.tasks.Optional
+  public String[] getSkipGenerationRegexes() {
+    return skipGenerationRegexes;
+  }
+
+  @Input
+  @org.gradle.api.tasks.Optional
+  public String[] getIncludeGenerationRegexes() {
+    return includeGenerationRegexes;
+  }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #Sat Apr 04 16:26:35 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

diff --git a/shared.gradle b/shared.gradle
@@ -1,16 +1,16 @@
 ext {
   isPublishable = false
-  version_assertj = '3.18.1'
-  version_awaitility = '4.0.3'
-  version_bouncycastle = '1.65'
+  version_assertj = '3.22.0'
+  version_awaitility = '4.2.0'
+  version_bouncycastle = '1.70'
   version_jackson = '2.10.1' // Matches transitive version for retrofit2:converter-jackson:2.8.1
-  version_junit = '5.7.0'
-  version_mockito = '3.7.0'
+  version_junit = '5.8.2'
+  version_mockito = '4.5.1'
   version_mustache = '1.15'
-  version_projectlombok = '1.18.22'
-  version_retrofit = '2.8.1'
-  version_rxjava2 = '2.2.19'
-  version_swagger_parser = '2.0.19'
+  version_projectlombok = '1.18.24'
+  version_retrofit = '2.9.0'
+  version_rxjava2 = '2.2.21'
+  version_swagger_parser = '2.0.32'
 }
 
 project.group = 'com.marcnuri.yakc'