Merge pull request #282 from lisa-analyzer/beta8-prerelease

Beta8 roundup

lisa/build.gradle

@@ -55,7 +55,7 @@ buildscript {
         classpath 'org.ajoberstar.grgit:grgit-core:4.1.1'
         classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.1'
 
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.2.1'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.18.0'
     }
 }
 
@@ -72,4 +72,4 @@ subprojects {
     apply from: "${project.rootDir}/code-style.gradle"
     apply from: "${project.rootDir}/java.gradle"
     apply from: "${project.rootDir}/publishing.gradle"
-}
+}

lisa/code-style.gradle

@@ -39,15 +39,13 @@ spotless {
 
         // use the eclipse formatting with the one provided with the project
         eclipse().configFile(new File(rootProject.projectDir, 'spotless-formatting.xml'))
-
+
+		target 'src/**/*.java'    
         // ignore generated code
-        target project.fileTree(project.projectDir) {
-            include '**/*.java'
-            exclude '**/build/generated/**'
-            exclude '**/build/generated-src/**'
-            exclude '**/target/generated-sources/**'
-            exclude '**/VersionInfo.java'
-        }
+        targetExclude '**/build/generated/**/*.java'
+        targetExclude '**/build/generated-src/**/*.java'
+        targetExclude '**/target/generated-sources/**/*.java'
+        targetExclude '**/VersionInfo.java'
     }
     antlr4 {
         target 'src/*/antlr/**/*.g4'
@@ -83,4 +81,4 @@ tasks.register('checkCodeStyle') {
     group = 'verification'
     description = 'Execute spotless and checkstyle to ensure code and javadoc formatting'
     dependsOn 'spotlessCheck', 'checkstyleMain', 'checkstyleTest'
-}
+}

lisa/gradle.properties

@@ -1,6 +1,6 @@
 # project properties
 group = 'it.unive'
-version = 0.1b7
+version = 0.1b8
 
 # gradle build properties
 org.gradle.caching=true

lisa/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lisa/gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #

lisa/lisa-sdk/build.gradle

@@ -40,3 +40,5 @@ tasks.register('generateVersionInfo', Copy) {
 }
 
 compileJava.dependsOn generateVersionInfo
+sourcesJar.dependsOn generateVersionInfo
+