Skip to content

Commit cf764c6

Browse files
Merge pull request #2 from SpineEventEngine/codex/find-and-fix-important-bug
Remove forcing Java `toolchain` in `buildSrc/build.gradle.kts`
2 parents 9ad5059 + 95c33ca commit cf764c6

File tree

10 files changed

+63
-48
lines changed

10 files changed

+63
-48
lines changed

buildSrc/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@ configurations.all {
155155
}
156156
}
157157

158-
java {
159-
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
160-
}
161-
162158
kotlin {
163159
compilerOptions {
164160
jvmTarget.set(JvmTarget.JVM_17)

buildSrc/settings.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
mavenLocal()
5+
mavenCentral()
6+
}
7+
}
8+
9+
plugins {
10+
id("org.gradle.toolchains.foojay-resolver-convention").version("1.0.0")
11+
}

dependencies.md

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

gradle.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1+
# Allow Gradle to auto-detect installed JDKs.
2+
org.gradle.java.installations.auto-detect=true
3+
4+
# Optional: Allow Gradle to download JDKs if needed.
5+
org.gradle.java.installations.auto-download=true
6+
7+
# Use parallel builds for better performance.
18
org.gradle.parallel=true
9+
#org.gradle.caching=true
210

311
# Dokka plugin eats more memory than usual. Therefore, all builds should have enough.
412
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -XX:+UseParallelGC

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

marker-tests/src/test/kotlin/io/spne/core/jvm/marker/EveryIsOptionRendererSpec.kt renamed to marker-tests/src/test/kotlin/io/spine/core/jvm/marker/EveryIsOptionRendererSpec.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525
*/
2626

27-
package io.spne.core.jvm.marker
27+
package io.spine.core.jvm.marker
2828

2929
import com.google.protobuf.Message
3030
import io.kotest.matchers.shouldBe

marker-tests/src/test/kotlin/io/spne/core/jvm/marker/IsOptionRendererSpec.kt renamed to marker-tests/src/test/kotlin/io/spine/core/jvm/marker/IsOptionRendererSpec.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525
*/
2626

27-
package io.spne.core.jvm.marker
27+
package io.spine.core.jvm.marker
2828

2929
import io.kotest.matchers.string.shouldContain
3030
import java.nio.file.Path

marker-tests/src/test/kotlin/io/spne/core/jvm/marker/MarkerPluginTestSetup.kt renamed to marker-tests/src/test/kotlin/io/spine/core/jvm/marker/MarkerPluginTestSetup.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525
*/
2626

27-
package io.spne.core.jvm.marker
27+
package io.spine.core.jvm.marker
2828

2929
import com.google.protobuf.Empty
3030
import io.spine.tools.core.jvm.PluginTestSetup

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
1010
-->
1111
<groupId>io.spine.tools</groupId>
1212
<artifactId>core-jvm-compiler</artifactId>
13-
<version>2.0.0-SNAPSHOT.003</version>
13+
<version>2.0.0-SNAPSHOT.004</version>
1414

1515
<inceptionYear>2015</inceptionYear>
1616

version.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
*
3030
* Do not rename this property, as it is also used in the integration tests via its name.
3131
*/
32-
val coreJvmCompilerVersion by extra("2.0.0-SNAPSHOT.003")
32+
val coreJvmCompilerVersion by extra("2.0.0-SNAPSHOT.004")
3333
val versionToPublish by extra(coreJvmCompilerVersion)

0 commit comments

Comments
 (0)