small fixes, disabled jupyter module for now

Author: Jolanrensen

.github/workflows/build.yml

@@ -36,11 +36,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Build the plugins first
-        run: >
-          ./gradlew
-          updateBootstrapVersion
-
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v2
         with:

build.gradle.kts

@@ -3,6 +3,7 @@
 import Projects.compilerPlugin
 import Projects.gradlePlugin
 import com.github.gmazzo.buildconfig.BuildConfigExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 
 buildscript {
@@ -126,14 +127,23 @@ allprojects {
 }
 
 subprojects {
-    // Adding the bootstraps directory to the repositories of the subprojects, so that
-    // the bootstrap version of compiler-plugin.jar can be found and used by the gradle-plugin
-    // without mavenLocal
-    repositories.flatDir {
-        dirs("${project.rootDir.absolutePath}/gradle/bootstraps")
-    }
-
     afterEvaluate {
+        // Adding the bootstraps directory to the repositories of the subprojects, so that
+        // the bootstrap version of compiler-plugin.jar can be found and used by the gradle-plugin
+        // without mavenLocal
+        if (plugins.hasPlugin("org.jetbrains.kotlinx.spark.api")) {
+            repositories.flatDir {
+                dirs("${project.rootDir.absolutePath}/gradle/bootstraps")
+            }
+            tasks.withType<KotlinCompile> {
+                dependsOn(":compiler-plugin:updateBootstrapVersion")
+                dependsOn(":gradle-plugin:updateBootstrapVersion")
+            }
+        }
+
+        repositories.flatDir {
+            dirs("${project.rootDir.absolutePath}/gradle/bootstraps")
+        }
         extensions.findByType<BuildConfigExtension>()?.apply {
             val projectVersion = Versions.project
             val groupId = Versions.groupID

gradle.properties

@@ -2,17 +2,14 @@ kotlin.daemon.jvmargs=-Xmx8g
 org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 mavenCentralUsername=dummy
 mavenCentralPassword=dummy
-
 GROUP=org.jetbrains.kotlinx.spark
-
 # Controls the spark and scala version for the entire project
 # can also be defined like ./gradlew -Pspark=X.X.X -Pscala=X.X.X build
 spark=3.5.1
 scala=2.13.13
-# scala=2.12.19
+#scala=2.12.19
 skipScalaOnlyDependent=false
 sparkConnect=false
-
 org.gradle.caching=true
 org.gradle.parallel=false
 #kotlin.incremental.useClasspathSnapshot=true

gradle/bootstraps/compiler-plugin.jar

@@ -35,7 +35,7 @@ rootProject.name = "kotlin-spark-api-parent_$versions"
 include("scala-helpers")
 include("scala-tuples-in-kotlin")
 include("kotlin-spark-api")
-include("jupyter")
+//include("jupyter")
 include("examples")
 include("compiler-plugin")
 include("gradle-plugin")