Skip to content

Commit ca99f2d

Browse files
committed
- chore: updates;
1 parent d251922 commit ca99f2d

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

.github/workflows/BranchCI.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/setup-java@master
1919
with:
2020
distribution: 'zulu'
21-
java-version: 11
21+
java-version: 21
2222

2323
- name: "Build and pretty-print site"
2424
run: ./gradlew --no-daemon --console=plain buildAndPrettyPrintSite

.github/workflows/CI.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/setup-java@master
1919
with:
2020
distribution: 'zulu'
21-
java-version: 11
21+
java-version: 21
2222

2323
- name: "Build and upload site to Google Storage bucket"
2424
env:

build.gradle

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
id 'idea'
3-
id 'com.github.ben-manes.versions' version '0.44.0'
3+
id 'com.github.ben-manes.versions' version '0.53.0'
44
id 'scala'
5-
id 'io.miret.etienne.sass' version '1.5.1'
5+
id 'io.miret.etienne.sass' version '1.6.0'
66
}
77

88
idea {
@@ -14,6 +14,10 @@ idea {
1414
}
1515
}
1616

17+
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
18+
19+
scala.scalaVersion = '3.7.4'
20+
1721
// There is no Java in the project :)
1822
project.gradle.startParameter.excludedTaskNames.add('compileJava')
1923

@@ -22,21 +26,34 @@ tasks.withType(ScalaCompile).configureEach {
2226
additionalParameters = [
2327
'-new-syntax',
2428
'-feature',
25-
'-language:strictEquality'
29+
'-language:strictEquality',
30+
'-source:future'
2631
]
2732
}
2833
}
2934

3035
description = '19 Kislev Archive'
3136

32-
final String opentorahVersion = '0.10.13'
37+
final String opentorahVersion = '0.10.16'
3338

3439
dependencies {
35-
implementation 'org.scala-lang:scala3-library_3:3.6.2'
3640
implementation "org.opentorah:opentorah-collector:$opentorahVersion"
3741
implementation "org.opentorah:opentorah-util:$opentorahVersion" // for the Cutter
3842
}
3943

44+
def isNonStable = { String version ->
45+
boolean stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) }
46+
String regex = /^[0-9,.v-]+(-r)?$/
47+
return !stableKeyword && !(version ==~ regex)
48+
}
49+
50+
// dependencyUpdates.revision = 'release'
51+
tasks.named("dependencyUpdates").configure {
52+
rejectVersionIf {
53+
isNonStable(it.candidate.version)
54+
}
55+
}
56+
4057
compileSass {
4158
group = 'publishing'
4259

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

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.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)