Fixed a lot of up-to-date Gradle checks to speed up integration test …

…running
ptuomola · Apr 9, 2022 · ce6a1fc · ce6a1fc
1 parent ab80cc0
commit ce6a1fc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -289,18 +289,6 @@ allprojects  {
         strictCheck true
     }
 
-    task licenseFormatBuildScripts (type:nl.javadude.gradle.plugins.license.License) {
-        source = fileTree(dir: "$rootDir/", includes: [
-            '**/*.bat',
-            '**/*.sh',
-            '**/*.sql'
-        ], excludes: [
-            '**/gradlew*'
-        ])
-    }
-
-    licenseFormat.dependsOn licenseFormatBuildScripts
-
     licenseReport {
         outputDir = "$projectDir/licenses"
     }

diff --git a/fineract-client/build.gradle b/fineract-client/build.gradle
@@ -38,7 +38,7 @@ openApiValidate {
     recommend = true
 }
 
-task buildJavaSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
+task buildJavaSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
     generatorName = 'java'
     verbose = false
     validateSpec = false
@@ -63,12 +63,6 @@ task buildJavaSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateT
     dependsOn = [
         ':fineract-provider:resolve'
     ]
-    finalizedBy = [licenseFormat]
-    // uncomment below block to automatically copy the custom files in generated SDK
-    /*copy {
-     from file('src/main/java')
-     into file("$buildDir/generated/java/src/main/java")
-     }*/
 }
 
 task buildTypescriptAngularSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
@@ -90,9 +84,12 @@ task buildTypescriptAngularSdk(type: org.openapitools.generator.gradle.plugin.ta
     dependsOn = [
         ':fineract-provider:resolve'
     ]
-    finalizedBy = [licenseFormat]
 }
 
+licenseFormatMain.dependsOn buildJavaSdk
+licenseFormatMain.dependsOn buildTypescriptAngularSdk
+compileJava.dependsOn licenseFormatMain
+
 // TODO: @vidakovic we could provide even more client libs in different languages (Go, Ruby, Swift etc.)
 compileJava.dependsOn buildJavaSdk, spotlessJavaApply, buildTypescriptAngularSdk, spotlessMiscApply
 
@@ -120,7 +117,4 @@ test {
     useJUnitPlatform()
 }
 
-// Gradle 7.x asks for explicit dependencies between tasks
-licenseFormatBuildScripts.dependsOn spotlessGroovyGradle, spotlessJava, spotlessMisc, compileJava, processResources, compileTestJava, rat, test
-
 sourceSets.main.java.srcDir new File(buildDir, "generated/java/src/main/java")
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
@@ -73,6 +73,7 @@ resolve {
     classpath = sourceSets.main.runtimeClasspath
     outputDir = file("${buildDir}/generated/swagger-ui")
     openApiFile = file("config/swagger/fineract-input.yaml")
+    sortOutput = true
 }
 
 resolve.dependsOn prepareInputYaml

diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
@@ -79,3 +79,5 @@ test {
     dependsOn cargoStartLocal
     finalizedBy cargoStopLocal
 }
+
+compileTestJava.dependsOn ':fineract-client:processResources'