Skip to content

Commit 4f8d874

Browse files
JolanrensenJolanrensen
committed
updating some build parameters
1 parent d60e4dc commit 4f8d874

File tree

12 files changed

+43
-37
lines changed

12 files changed

+43
-37
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
~/.gradle/caches
3333
~/.gradle/wrapper
3434
~/.gradle/jdks
35-
key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
35+
key: "${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}"
3636
restore-keys: |
3737
${{ runner.os }}-gradle-
3838

‎.github/workflows/generate_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
~/.gradle/caches
2727
~/.gradle/wrapper
2828
~/.gradle/jdks
29-
key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
29+
key: "${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}"
3030
restore-keys: |
3131
${{ runner.os }}-gradle-
3232

‎.github/workflows/publish_dev_version.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
~/.gradle/caches
3434
~/.gradle/wrapper
3535
~/.gradle/jdks
36-
key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
36+
key: "${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}"
3737
restore-keys: |
3838
${{ runner.os }}-gradle-
3939
@@ -55,7 +55,7 @@ jobs:
5555
./gradlew
5656
-Pspark=${{ matrix.spark }}
5757
-Pscala=${{ matrix.scala }}
58-
-PskipScalaTuplesInKotlin=${{ !(matrix.spark == '3.0.0' || matrix.scala == '2.13.10' && matrix.spark == '3.2.0') }}
58+
-PskipScalaOnlyDependent=${{ matrix.spark != matrix.spark[0] }}
5959
clean
6060
publishMavenPublicationToGitHubPackagesRepository
6161
--scan

‎.github/workflows/publish_release_version.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
~/.gradle/caches
3333
~/.gradle/wrapper
3434
~/.gradle/jdks
35-
key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
35+
key: "${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}"
3636
restore-keys: |
3737
${{ runner.os }}-gradle-
3838
@@ -57,7 +57,7 @@ jobs:
5757
./gradlew
5858
-Pspark=${{ matrix.spark }}
5959
-Pscala=${{ matrix.scala }}
60-
-PskipScalaTuplesInKotlin=${{ !(matrix.spark == '3.0.0' || matrix.scala == '2.13.10' && matrix.spark == '3.2.0') }}
60+
-PskipScalaOnlyDependent=${{ matrix.spark != matrix.spark[0] }}
6161
clean
6262
publishMavenPublicationToMavenCentralRepository
6363
--scan

‎build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ buildscript {
1010
}
1111
}
1212

13-
1413
plugins {
1514
mavenPublish version Versions.mavenPublish
1615
dokka version Versions.dokka

‎buildSrc/src/main/kotlin/Versions.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object Versions {
1111
inline val scalaCompat get() = scala.substringBeforeLast('.')
1212

1313
// TODO
14-
const val sparkConnect = false
14+
inline val sparkConnect get() = System.getProperty("sparkConnect", "false").toBoolean()
1515

1616
const val jupyter = "0.12.0-32-1"
1717

@@ -39,5 +39,4 @@ object Versions {
3939
"version" to project,
4040
"sparkConnect" to sparkConnect.toString(),
4141
)
42-
4342
}

‎gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ GROUP=org.jetbrains.kotlinx.spark
1010
spark=3.5.1
1111
scala=2.13.13
1212
# scala=2.12.19
13-
skipScalaTuplesInKotlin=false
13+
skipScalaOnlyDependent=false
14+
sparkConnect=false
1415

1516
org.gradle.caching=true
1617
org.gradle.parallel=false

‎gradlew_all_versions

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ set -euo pipefail
55
# but now like `./gradlew_all_versions arguments`.
66

77
DRY_RUN=${DRY_RUN:-false}
8-
SCALA2_12VERSION="2.12.16"
9-
SCALA2_13VERSION="2.13.8"
10-
SparkVersionsForBothScalaVersions=("3.3.0" "3.2.1" "3.2.0")
11-
SparkVersionsForScala2_12=("3.1.3" "3.1.2" "3.1.1" "3.1.0" "3.0.3" "3.0.2" "3.0.1" "3.0.0")
8+
SCALA2_12VERSION="2.12.19"
9+
SCALA2_13VERSION="2.13.13"
10+
SparkVersionsForBothScalaVersions=("3.4.2" "3.5.1")
11+
SparkVersionsForScala2_12=()
1212

1313
echo Running for "$(expr ${#SparkVersionsForBothScalaVersions[@]} \* 2 + ${#SparkVersionsForScala2_12[@]}) versions of the library."
1414

@@ -19,33 +19,37 @@ fi
1919

2020
ARGS=("$@")
2121
execute() {
22-
echo "running ./gradlew -Pspark=$SPARK -Pscala=$SCALA -PskipScalaTuplesInKotlin=$SKIP_SCALA_TUPLES -PenforceCleanJCP=true ${ARGS[*]}"
22+
echo "running ./gradlew -Pspark=$SPARK -Pscala=$SCALA -PskipScalaOnlyDependent=$SKIP_SCALA_TUPLES -PenforceCleanJCP=true ${ARGS[*]}"
2323
if [ "$DRY_RUN" = false ]; then
24-
./gradlew -Pspark="$SPARK" -Pscala="$SCALA" -PskipScalaTuplesInKotlin="$SKIP_SCALA_TUPLES" "${ARGS[@]}"
24+
./gradlew -Pspark="$SPARK" -Pscala="$SCALA" -PskipScalaOnlyDependent="$SKIP_SCALA_TUPLES" "${ARGS[@]}"
2525
fi
2626
}
2727

28-
SCALA="$SCALA2_12VERSION"
28+
#SCALA="$SCALA2_12VERSION"
2929
SKIP_SCALA_TUPLES=false
30-
for spark in "${SparkVersionsForScala2_12[@]}"; do
31-
SPARK="$spark"
32-
execute
33-
SKIP_SCALA_TUPLES=true
34-
done
30+
#for spark in "${SparkVersionsForScala2_12[@]}"; do
31+
# SPARK="$spark"
32+
# execute
33+
# SKIP_SCALA_TUPLES=true
34+
#done
3535

3636

3737
execute_for_both_scala_versions() {
3838
for spark in "${SparkVersionsForBothScalaVersions[@]}"; do
3939
SPARK="$spark"
4040
execute
41-
SKIP_SCALA_TUPLES=true
41+
if [ SPARK != "${SparkVersionsForBothScalaVersions[0]}" ]; then
42+
SKIP_SCALA_TUPLES=true
43+
else
44+
SKIP_SCALA_TUPLES=false
45+
fi
4246
done
4347
}
4448
SCALA="$SCALA2_12VERSION"
4549
execute_for_both_scala_versions
4650

4751
SCALA="$SCALA2_13VERSION"
48-
SKIP_SCALA_TUPLES=false
52+
#SKIP_SCALA_TUPLES=false
4953
execute_for_both_scala_versions
5054

5155

‎kotlin-spark-api/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ dependencies {
4040
// https://github.com/FasterXML/jackson-bom/issues/52
4141
if (Versions.spark == "3.3.1") implementation(jacksonDatabind)
4242

43+
if (Versions.sparkConnect) TODO("unsupported for now")
44+
4345
implementation(
4446
kotlinStdLib,
4547
reflect,
@@ -159,8 +161,3 @@ tasks.withType<AbstractDokkaLeafTask> {
159161
mavenPublishing {
160162
configure(KotlinJvm(Dokka("dokkaHtml")))
161163
}
162-
163-
164-
165-
166-

‎scala-helpers/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@file:Suppress("UnstableApiUsage", "NOTHING_TO_INLINE")
1+
@file:Suppress("UnstableApiUsage")
22

33
import com.igormaznitsa.jcp.gradle.JcpTask
44
import com.vanniktech.maven.publish.JavaLibrary
@@ -35,7 +35,6 @@ dependencies {
3535
}
3636
}
3737

38-
3938
java {
4039
toolchain {
4140
if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8
@@ -99,3 +98,8 @@ mavenPublishing {
9998
configure(JavaLibrary(Javadoc()))
10099
}
101100

101+
// Publishing of scala-helpers can be skipped since it's only dependent on the Scala version
102+
val skipScalaOnlyDependent = System.getProperty("skipScalaOnlyDependent").toBoolean()
103+
tasks
104+
.filter { "publish" in it.name }
105+
.forEach { it.onlyIf { !skipScalaOnlyDependent } }

‎scala-tuples-in-kotlin/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ mavenPublishing {
7070

7171

7272
// Publishing of scala-tuples-in-kotlin can be skipped since it's only dependent on the Scala version
73-
val skipScalaTuplesInKotlin = System.getProperty("skipScalaTuplesInKotlin").toBoolean()
73+
val skipScalaOnlyDependent = System.getProperty("skipScalaOnlyDependent").toBoolean()
7474
tasks
7575
.filter { "publish" in it.name }
76-
.forEach { it.onlyIf { !skipScalaTuplesInKotlin } }
76+
.forEach { it.onlyIf { !skipScalaOnlyDependent } }
7777

‎settings.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ gradleEnterprise {
99
}
1010
}
1111

12-
1312
val spark: String by settings
1413
val scala: String by settings
15-
val skipScalaTuplesInKotlin: String by settings
14+
val skipScalaOnlyDependent: String by settings
1615
System.setProperty("spark", spark)
1716
System.setProperty("scala", scala)
18-
System.setProperty("skipScalaTuplesInKotlin", skipScalaTuplesInKotlin)
17+
System.setProperty("skipScalaOnlyDependent", skipScalaOnlyDependent)
1918

2019

2120
val scalaCompat
@@ -31,8 +30,11 @@ include("kotlin-spark-api")
3130
include("jupyter")
3231
include("examples")
3332

34-
project(":scala-helpers").name = "scala-helpers_$versions"
33+
// just scala dependent
34+
project(":scala-helpers").name = "scala-helpers_$scalaCompat"
3535
project(":scala-tuples-in-kotlin").name = "scala-tuples-in-kotlin_$scalaCompat"
36+
37+
// spark+scala dependent
3638
project(":kotlin-spark-api").name = "kotlin-spark-api_$versions"
3739
project(":jupyter").name = "jupyter_$versions"
3840
project(":examples").name = "examples_$versions"

0 commit comments

Comments
 (0)