diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11cb8db0..c585a26f 100644 --- a/.github/workflows/build.yml +++ b/.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: diff --git a/build.gradle.kts b/build.gradle.kts index 57a5e14b..d60dcf4b 100644 --- a/build.gradle.kts +++ b/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 { + dependsOn(":compiler-plugin:updateBootstrapVersion") + dependsOn(":gradle-plugin:updateBootstrapVersion") + } + } + + repositories.flatDir { + dirs("${project.rootDir.absolutePath}/gradle/bootstraps") + } extensions.findByType()?.apply { val projectVersion = Versions.project val groupId = Versions.groupID diff --git a/gradle.properties b/gradle.properties index 6e9174a6..84b4e85c 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/bootstraps/compiler-plugin.jar b/gradle/bootstraps/compiler-plugin.jar index 9274a64d..c5518fe5 100644 Binary files a/gradle/bootstraps/compiler-plugin.jar and b/gradle/bootstraps/compiler-plugin.jar differ diff --git a/gradle/bootstraps/gradle-plugin.jar b/gradle/bootstraps/gradle-plugin.jar index a10e11bf..cc2d1b36 100644 Binary files a/gradle/bootstraps/gradle-plugin.jar and b/gradle/bootstraps/gradle-plugin.jar differ diff --git a/settings.gradle.kts b/settings.gradle.kts index 98776e06..8ad32812 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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") @@ -46,7 +46,7 @@ project(":scala-tuples-in-kotlin").name = "scala-tuples-in-kotlin_$scalaCompat" // spark+scala dependent project(":kotlin-spark-api").name = "kotlin-spark-api_$versions" -project(":jupyter").name = "jupyter_$versions" +//project(":jupyter").name = "jupyter_$versions" project(":examples").name = "examples_$versions" buildCache {