Improvements for build files.

Signed-off-by: Marcin Kuszczak <1508798+aartiPl@users.noreply.github.com>

Author: aartiPl

.github/workflows/build.yml

@@ -64,23 +64,23 @@ jobs:
           
           echo "OsType:         $OSTYPE"
           
-          gradle clean assemble test || { echo 'Compilation or Unit tests failed' ; exit 1; }
+          ./gradlew clean assemble test || { echo 'Compilation or Unit tests failed' ; exit 1; }
           
           if [[ "$OSTYPE" == "linux"* ]]; then
             echo "Linux test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix | linux' integration
+            ./gradlew -DosType=$OSTYPE -DincludeTags='posix | linux' integration
           elif [[ "$OSTYPE" == "darwin"* ]]; then
             echo "MacOs test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix | macos' integration
+            ./gradlew -DosType=$OSTYPE -DincludeTags='posix | macos' integration
           elif [[ "$OSTYPE" == "cygwin" ]]; then
             echo "Cygwin test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix | cygwin' integration
+            ./gradlew -DosType=$OSTYPE -DincludeTags='posix | cygwin' integration
           elif [[ "$OSTYPE" == "msys" ]]; then
             echo "MSys test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix | msys' integration
+            ./gradlew -DosType=$OSTYPE -DincludeTags='posix | msys' integration
           elif [[ "$OSTYPE" == "freebsd"* ]]; then
             echo "FreeBsd test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix' integration      
+            ./gradlew -DosType=$OSTYPE -DincludeTags='posix' integration      
           else
             echo "Unknown OS"
             exit 1
@@ -91,9 +91,9 @@ jobs:
         shell: cmd
         run: |
           echo "Windows test..."
-          gradle clean assemble test
+          .\gradlew.bat clean assemble test
           if %errorlevel% neq 0 exit /b %errorlevel%
-          gradle -DosType=windows -DincludeTags="windows" integration
+          .\gradlew.bat -DosType=windows -DincludeTags="windows" integration
 
       - name: Install Cygwin (only Windows)
         if: matrix.variant == 'cygwin'
@@ -107,5 +107,5 @@ jobs:
           echo "Cygwin test..."
           echo "Changing directory to $GITHUB_WORKSPACE ..."
           cd $GITHUB_WORKSPACE
-          gradle clean assemble test || { echo 'Compilation or Unit tests failed' ; exit 1; }
-          gradle -DosType=$OSTYPE -DincludeTags='posix | cygwin' integration
+          ./gradlew clean assemble test || { echo 'Compilation or Unit tests failed' ; exit 1; }
+          ./gradlew -DosType=$OSTYPE -DincludeTags='posix | cygwin' integration

build.gradle.kts

@@ -13,6 +13,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
     `maven-publish`
     signing
+    idea
 }
 
 repositories {
@@ -35,21 +36,19 @@ buildConfig {
 
     buildConfigField("String", "APP_NAME", "\"${project.name}\"")
     buildConfigField("String", "APP_VERSION", provider { "\"${project.version}\"" })
-    buildConfigField("java.time.ZonedDateTime", "APP_BUILD_TIME", provider { "java.time.ZonedDateTime.parse(\"$dateTime\")" })
+    buildConfigField("java.time.ZonedDateTime",
+        "APP_BUILD_TIME",
+        provider { "java.time.ZonedDateTime.parse(\"$dateTime\")" })
     buildConfigField("String", "KOTLIN_VERSION", provider { "\"${kotlinVersion}\"" })
 }
 
 sourceSets {
     create("integration") {
-//        test {  //With that idea can understand that 'integration' is a test source set and do not complain about test
-//        names starting with upper case, but it doesn't compile correctly with it
-        java {
-            srcDir("$projectDir/src/integration/kotlin")
-        }
+        kotlin.srcDir("$projectDir/src/integration/kotlin")
         resources.srcDir("$projectDir/src/integration/resources")
+
         compileClasspath += main.get().output + test.get().output
         runtimeClasspath += main.get().output + test.get().output
-//        }
     }
 }
 
@@ -63,6 +62,13 @@ configurations {
     get("integrationRuntimeOnly").extendsFrom(get("testRuntimeOnly"))
 }
 
+idea {
+    module {
+        @Suppress("UnstableApiUsage")
+        testSources.from(sourceSets["integration"].kotlin.srcDirs)
+    }
+}
+
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(8))
@@ -78,7 +84,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
     }
 }
 
-tasks.create<Test>("integration") {
+tasks.create<Test>("integrationTest") {
     val itags = System.getProperty("includeTags") ?: ""
     val etags = System.getProperty("excludeTags") ?: ""
 
@@ -101,7 +107,7 @@ tasks.create<Test>("integration") {
     testClassesDirs = sourceSets["integration"].output.classesDirs
     classpath = sourceSets["integration"].runtimeClasspath
     outputs.upToDateWhen { false }
-    mustRunAfter(tasks["test"])
+    //mustRunAfter(tasks["test"])
     //dependsOn(tasks["assemble"], tasks["test"])
 
     doLast {
@@ -205,8 +211,7 @@ application {
     mainClass.set(project.group.toString() + ".KscriptKt")
 }
 
-val jar: Task by tasks.getting {
-}
+val jar: Task by tasks.getting {}
 
 val shadowDistTar: Task by tasks.getting {
     enabled = false