Make build compatible with gradle v8.1.1 and java 17

dulajdilshan · May 31, 2023 · 7f6422b · 7f6422b
1 parent 6075db7
commit 7f6422b
Show file tree

Hide file tree

Showing 27 changed files with 91 additions and 93 deletions.
diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "de.undercouch.download" version "3.4.3"
+    id "de.undercouch.download" version "5.4.0"
     id 'base'
 }
 

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,5 @@
 plugins {
     id 'base'
-//    id 'com.gradle.build-scan' version '3.6.4'
-//    id "com.gradle.enterprise" version "3.13.2"
-//    id "com.github.spotbugs" version "4.7.3"
     id "com.github.spotbugs" version "4.7.3"
     id "com.dorongold.task-tree" version "1.3.1"
     id "com.github.johnrengelman.shadow" version "8.1.0"
@@ -23,10 +20,6 @@ allprojects {
             println projectDir
         }
     }
-
-    tasks.withType(Jar){
-        duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    }
 }
 
 subprojects {

diff --git a/cli/ballerina-cli/build.gradle b/cli/ballerina-cli/build.gradle
@@ -46,6 +46,11 @@ dependencies {
     implementation project(':toml-parser')
     implementation project(':identifier-util')
     testImplementation project(':ballerina-test-utils')
+    implementation 'org.ow2.asm:asm'
+    implementation "org.ow2.asm:asm-commons:${project.ow2AsmCommonsVersion}"
+    implementation "org.jacoco:org.jacoco.core:${project.jacocoVersion}"
+    implementation "org.jacoco:org.jacoco.report:${project.jacocoVersion}"
+//    implementation group: 'org.jacoco', name: 'org.jacoco.core', version: "${project.jacocoVersion}"
 
     testImplementation 'org.testng:testng'
     testImplementation 'org.mockito:mockito-all'
@@ -105,3 +110,5 @@ compileJava {
         classpath = files()
     }
 }
+
+tasks.compileJava.dependsOn(':testerina:testerina-core:copyInteropImports')
diff --git a/cli/ballerina-cli/src/main/java/module-info.java b/cli/ballerina-cli/src/main/java/module-info.java
@@ -21,5 +21,4 @@
     requires io.ballerina.toml;
     requires io.ballerina.identifier;
     requires org.objectweb.asm;
-    requires org.objectweb.asm.commons;
 }
diff --git a/distribution/zip/jballerina-tools/LICENSE b/distribution/zip/jballerina-tools/LICENSE
@@ -53,7 +53,7 @@ ballerina-time-1.0.0-java.jar
 ballerina-transactions-0.5.0-java.jar                                                               jar            apache2
 maven-resolver-2.0.0-Preview1.jar                                                                   jar            apache2
 ballerina-lang.value-1.0.0-java.jar                                                                 jar            apache2
-asm-analysis-7.1.jar                                                                                bundle         bsd
+asm-analysis-9.5.jar                                                                                bundle         bsd
 ballerina-lang.boolean-1.0.0.jar                                                                    jar            apache2
 ballerina-transactions-0.5.0.jar                                                                    jar            apache2
 ballerina-runtime-0.5.0-java.jar                                                                    jar            apache2
@@ -81,7 +81,7 @@ ballerina-lang.annotations-1.0.0-java.jar
 ballerina-logging-2.0.0-Preview1.jar                                                                jar            apache2
 jaxen-1.1.6.jar                                                                                     bundle         apache2
 ballerina-http-1.0.0.jar                                                                            jar            apache2
-asm-tree-7.1.jar                                                                                    bundle         bsd
+asm-tree-9.5.jar                                                                                    bundle         bsd
 ballerina-lang.typedesc-1.0.0.jar                                                                   jar            apache2
 commons-collections-3.2.2.jar                                                                       bundle         apache2
 ballerina-java.arrays-0.9.0.jar                                                                     jar            apache2
@@ -117,7 +117,7 @@ ballerina-rabbitmq-1.0.0.jar
 ballerina-cli-utils-2.0.0-Preview1.jar                                                              jar            apache2
 kafka-clients-2.3.1.jar                                                                             jar            apache2
 ballerina-encoding-1.0.0-java.jar                                                                   jar            apache2
-asm-7.1.jar                                                                                         bundle         bsd
+asm-9.5.jar                                                                                         bundle         bsd
 netty-resolver-4.1.39.Final.jar                                                                     bundle         apache2
 ballerina-lang.int-1.1.0-java.jar                                                                   jar            apache2
 ballerina-lang.stream-0.4.0.jar                                                                     jar            apache2
@@ -187,7 +187,7 @@ netty-transport-4.1.39.Final.jar
 ballerina-stringutils-0.5.0.jar                                                                     jar            apache2
 axiom-impl-1.4.0.jar                                                                                bundle         apache2
 ballerina-file-0.5.0-java.jar                                                                       jar            apache2
-asm-util-7.1.jar                                                                                    bundle         bsd
+asm-util-9.5.jar                                                                                    bundle         bsd
 broker-common-0.970.0.jar                                                                           bundle         apache2
 ballerina-cli-module-2.0.0-Preview1.jar                                                             jar            apache2
 jackson-datatype-jsr310-2.9.5.jar                                                                   bundle         apache2

diff --git a/distribution/zip/jballerina/LICENSE b/distribution/zip/jballerina/LICENSE
@@ -55,7 +55,7 @@ ballerina-jaeger-extension-1.1.0.jar
 value-1.1.0.jar                                                                                     jar            apache2
 module_cli_token_updater.jar                                                                        jar            apache2
 jsonutils.jar                                                                                       jar            apache2
-asm-analysis-7.1.jar                                                                                bundle         bsd
+asm-analysis-9.5.jar                                                                                bundle         bsd
 ballerina-openshift-1.1.0.jar                                                                       jar            apache2
 kafka-clients-2.0.1.jar                                                                             jar            apache2
 openshift.jar                                                                                       jar            apache2
@@ -82,7 +82,7 @@ openapi-to-ballerina-generator-1.1.0.jar
 kubernetes-extension-1.1.0.jar                                                                      jar            apache2
 jaxen-1.1.6.jar                                                                                     bundle         apache2
 math.jar                                                                                            jar            apache2
-asm-tree-7.1.jar                                                                                    bundle         bsd
+asm-tree-9.5.jar                                                                                    bundle         bsd
 test.jar                                                                                            jar            apache2
 xmlutils.jar                                                                                        jar            apache2
 ballerina-openapi-1.1.0.jar                                                                         jar            apache2
@@ -116,7 +116,7 @@ lang.table.jar
 ballerina-prometheus-extension-1.1.0.jar                                                            jar            apache2
 ballerina-jvm-1.1.0.jar                                                                             jar            apache2
 filepath.jar                                                                                        jar            apache2
-asm-7.1.jar                                                                                         bundle         bsd
+asm-9.5.jar                                                                                         bundle         bsd
 netty-resolver-4.1.39.Final.jar                                                                     bundle         apache2
 llvm.jar                                                                                            jar            apache2
 java.jar                                                                                            jar            apache2
@@ -178,7 +178,7 @@ netty-transport-4.1.39.Final.jar
 encoding.jar                                                                                        jar            apache2
 axiom-impl-1.4.0.jar                                                                                bundle         apache2
 ballerina-jdbc-1.1.0.jar                                                                            jar            apache2
-asm-util-7.1.jar                                                                                    bundle         bsd
+asm-util-9.5.jar                                                                                    bundle         bsd
 streams.jar                                                                                         jar            apache2
 broker-common-0.970.0.jar                                                                           bundle         apache2
 integer-1.1.0.jar                                                                                   jar            apache2

diff --git a/gradle/ballerinaLangLibBuild.gradle b/gradle/ballerinaLangLibBuild.gradle
@@ -50,13 +50,14 @@ compileJava {
 }
 
 class BallerinaLangLibBuildTask extends JavaExec {
-    def projectDir = ''
-    def distCache = ''
-    def pkgName = project.name
-    def skipBootstrap = 'false'
+    @Internal def projectDir = ''
+    @Internal def distCache = ''
+    @Internal def pkgName = project.name
+    @Internal def skipBootstrap = 'false'
 
     BallerinaLangLibBuildTask() {
-        setMain('org.ballerinalang.stdlib.utils.BuildLangLib')
+//        setMain('org.ballerinalang.stdlib.utils.BuildLangLib')
+        getMainClass().set('org.ballerinalang.stdlib.utils.BuildLangLib')
     }
 
     @Override

diff --git a/gradle/ballerinaNativeStdLibBuild.gradle b/gradle/ballerinaNativeStdLibBuild.gradle
@@ -77,10 +77,10 @@ compileJava {
 }
 
 class BallerinaLangLibBuildTask extends JavaExec {
-    def projectDir = ''
-    def distCache = ''
-    def pkgName = project.name
-    def skipBootstrap = 'false'
+    @Internal def projectDir = ''
+    @Internal def distCache = ''
+    @Internal def pkgName = project.name
+    @Internal def skipBootstrap = 'false'
 
     BallerinaLangLibBuildTask() {
         setMain('org.ballerinalang.stdlib.utils.BuildLangLib')

diff --git a/gradle/ballerinaStdLibBuild.gradle b/gradle/ballerinaStdLibBuild.gradle
@@ -79,10 +79,10 @@ compileJava {
 }
 
 class BallerinaLangLibBuildTask extends JavaExec {
-    def projectDir = ''
-    def distCache = ''
-    def pkgName = project.name
-    def skipBootstrap = 'false'
+    @Internal def projectDir = ''
+    @Internal def distCache = ''
+    @Internal def pkgName = project.name
+    @Internal def skipBootstrap = 'false'
 
     BallerinaLangLibBuildTask() {
         setMain('org.ballerinalang.stdlib.utils.BuildLangLib')

diff --git a/gradle/ballerinaStdLibBuildInternal.gradle b/gradle/ballerinaStdLibBuildInternal.gradle
@@ -79,10 +79,10 @@ compileJava {
 }
 
 class BallerinaLangLibBuildTask extends JavaExec {
-    def projectDir = ''
-    def distCache = ''
-    def pkgName = project.name
-    def skipBootstrap = 'false'
+    @Internal def projectDir = ''
+    @Internal def distCache = ''
+    @Internal def pkgName = project.name
+    @Internal def skipBootstrap = 'false'
 
     BallerinaLangLibBuildTask() {
         setMain('org.ballerinalang.stdlib.utils.BuildLangLib')

diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java
@@ -114,7 +114,7 @@ public void testFromHexString() {
         BError err = (BError) result.get(1);
         assertEquals(err.getErrorMessage().getValue(),
                 getModulePrefixedReason(INT_LANG_LIB, NUMBER_PARSING_ERROR_IDENTIFIER).getValue());
-        assertEquals(err.getDetails().toString(), "{\"message\":\"For input string: \"12invalid34\"\"}");
+        assertEquals(err.getDetails().toString(), "{\"message\":\"For input string: \"12invalid34\" under radix 16\"}");
     }
 
     @DataProvider(name = "MaxNumList")

diff --git a/language-server/modules/langserver-core/build.gradle b/language-server/modules/langserver-core/build.gradle
@@ -148,3 +148,4 @@ task buildAndCopy(type: Copy) {
             '/bre/lib'
 }
 
+tasks.compileJava.dependsOn(':language-server:language-server-stdlib:copyInteropImports')
diff --git a/misc/diagram-util/build.gradle b/misc/diagram-util/build.gradle
@@ -21,9 +21,9 @@ configurations {
     dist {
         transitive false
     }
-    dependency {
-        transitive false
-    }
+//    dependency {
+//        transitive false
+//    }
     libs
     distributionBala
 }
@@ -32,7 +32,7 @@ dependencies {
     implementation project(':ballerina-lang')
     implementation project(':ballerina-parser')
     implementation project(':ballerina-tools-api')
-    implementation project(':docerina')
+    implementation(project(':docerina'))
     implementation project(':central-client')
 
     implementation 'org.apache.commons:commons-lang3'
@@ -45,16 +45,6 @@ description = 'Diagram utils for Syntax tree JSON generation'
 
 ext.moduleName = 'diagram-util'
 
-compileJava {
-    inputs.property("moduleName", moduleName)
-    doFirst {
-        options.compilerArgs = [
-                '--module-path', classpath.asPath,
-        ]
-        classpath = files()
-    }
-}
-
 test {
     dependsOn loadDistributionCache
     systemProperty "ballerina.home", "$buildDir/"
@@ -64,3 +54,8 @@ test {
         suites 'src/test/resources/testng.xml'
     }
 }
+
+///*this is to let gradle infer the locations of the modules*/
+//java {
+//    modularity.inferModulePath.set(true)
+//}
diff --git a/misc/docerina/build.gradle b/misc/docerina/build.gradle
@@ -16,7 +16,7 @@
  */
 
 apply plugin: 'base'
-apply plugin: 'com.github.johnrengelman.shadow'
+//apply plugin: 'com.github.johnrengelman.shadow'
 
 apply from: "$rootDir/gradle/javaProject.gradle"
 apply from: "$rootDir/gradle/ballerinaLangLibLoad.gradle"
@@ -90,21 +90,21 @@ artifacts {
     file("$sourceSets.main.output.resourcesDir/doc-ui/")
 }
 
-jar {
-    enabled = false
-    dependsOn(shadowJar { archiveClassifier = null })
-    manifest {
-        attributes(
-            'Main-Class': 'org.ballerinalang.docgen.docs.BallerinaDocGeneratorMain',
-            'Implementation-Title': 'Ballerina - Docerina',
-            'Specification-Title': 'Ballerina - Docerina',
-            'Specification-Vendor': 'WSO2',
-            'Implementation-Vendor-Id': 'org.ballerinalang',
-            'Implementation-Vendor': 'WSO2',
-            'Implementation-URL': 'https://ballerina.io/misc/docerina/'
-        )
-    }
-}
+//jar {
+//    enabled = false
+//    dependsOn(shadowJar { archiveClassifier = null })
+//    manifest {
+//        attributes(
+//            'Main-Class': 'org.ballerinalang.docgen.docs.BallerinaDocGeneratorMain',
+//            'Implementation-Title': 'Ballerina - Docerina',
+//            'Specification-Title': 'Ballerina - Docerina',
+//            'Specification-Vendor': 'WSO2',
+//            'Implementation-Vendor-Id': 'org.ballerinalang',
+//            'Implementation-Vendor': 'WSO2',
+//            'Implementation-URL': 'https://ballerina.io/misc/docerina/'
+//        )
+//    }
+//}
 
 processResources {
     include '**/properties'
@@ -115,18 +115,18 @@ processResources {
     filter { String line -> line.replace('${short.version}', "${project.version}")}
 }
 
-shadowJar {
-    configurations = [project.configurations.runtimeClasspath]
-    dependencies {
-        include(dependency('com.atlassian.commonmark:commonmark'))
-        include(dependency('com.atlassian.commonmark:commonmark-ext-gfm-tables'))
-        include(dependency(':ballerina-lang'))
-        include(dependency(':ballerina-parser'))
-        exclude('META-INF/*.SF')
-        exclude('META-INF/*.DSA')
-        exclude('META-INF/*.RSA')
-    }
-}
+//shadowJar {
+//    configurations = [project.configurations.runtimeClasspath]
+//    dependencies {
+//        include(dependency('com.atlassian.commonmark:commonmark'))
+//        include(dependency('com.atlassian.commonmark:commonmark-ext-gfm-tables'))
+////        include(dependency(':ballerina-lang'))
+////        include(dependency(':ballerina-parser'))
+//        exclude('META-INF/*.SF')
+//        exclude('META-INF/*.DSA')
+//        exclude('META-INF/*.RSA')
+//    }
+//}
 
 task copyBala(type: Copy) {
     from configurations.distBal

diff --git a/misc/lib-creator/build.gradle b/misc/lib-creator/build.gradle
@@ -43,6 +43,7 @@ description = 'Ballerina - Library creation utility'
 
 // Creating uber jar of lib-creator to avoid windows gradle build issue with long class path with java commands.
 jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     from {
         configurations.dist.collect { it.isDirectory() ? it : zipTree(it) }
     } {

diff --git a/misc/ls-extensions/modules/bal-shell-service/build.gradle b/misc/ls-extensions/modules/bal-shell-service/build.gradle
@@ -60,6 +60,7 @@ compileJava {
 }
 
 jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes "Main-Class": "io.ballerina.shell.service.BalShellService"
     }

diff --git a/misc/ls-extensions/modules/json-to-record-converter/build.gradle b/misc/ls-extensions/modules/json-to-record-converter/build.gradle
@@ -70,6 +70,7 @@ compileJava {
 }
 
 jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes "Main-Class": "io.ballerina.converters.JsonToRecordConverterService"
     }

diff --git a/misc/ls-extensions/modules/partial-parser/build.gradle b/misc/ls-extensions/modules/partial-parser/build.gradle
@@ -59,6 +59,7 @@ compileJava {
 }
 
 jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes "Main-Class": "io.ballerina.parsers.PartialParserService"
     }

diff --git a/misc/ls-extensions/modules/performance-analyzer-services/build.gradle b/misc/ls-extensions/modules/performance-analyzer-services/build.gradle
@@ -69,6 +69,7 @@ compileJava {
 }
 
 jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes "Main-Class": "io.ballerina.PerformanceAnalyzer"
     }

diff --git a/misc/ls-extensions/modules/trigger-service/build.gradle b/misc/ls-extensions/modules/trigger-service/build.gradle
@@ -60,6 +60,7 @@ compileJava {
 }
 
 jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes "Main-Class": "io.ballerina.trigger.BallerinaTriggerService"
     }

diff --git a/misc/maven-resolver/build.gradle b/misc/maven-resolver/build.gradle
@@ -22,6 +22,7 @@ configurations {
 }
 
 jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes(
                 'Implementation-Title': 'Maven Resolver',

diff --git a/misc/testerina/modules/testerina-core/build.gradle b/misc/testerina/modules/testerina-core/build.gradle
@@ -45,7 +45,9 @@ dependencies {
     implementation group: 'io.github.java-diff-utils', name: 'java-diff-utils', version: "${project.javaDiffUtilsVersion}"
 }
 
-jar.archiveFileName = "${project.name}-${project.version}.jar"
+jar {
+    archiveFileName.set("${project.name}-${project.version}.jar")
+}
 
 task updateVersion {
     doLast {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -148,3 +148,4 @@ task buildAndCopy(type: Copy) {
		'/bre/lib'
		}

		tasks.compileJava.dependsOn(':language-server:language-server-stdlib:copyInteropImports')
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ description = 'Ballerina - Library creation utility' @@
     // Creating uber jar of lib-creator to avoid windows gradle build issue with long class path with java commands.
     jar {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         from {
             configurations.dist.collect { it.isDirectory() ? it : zipTree(it) }
         } {
@@ Expand Down @@