diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c0708ba..c9692f0 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,8 +9,6 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - name: Execute Gradle build run: ./gradlew build - name: Prepare Docker image build diff --git a/build.gradle b/build.gradle index c0349f9..6c4dcc3 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ allprojects { subproject -> tasks.withType(JavaCompile) { modularity.inferModulePath = true - options.release = 21 + options.release = 25 } tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) { @@ -80,7 +80,7 @@ allprojects { subproject -> pluginManager.withPlugin(catalog.plugins.kotlin.jvm.get().pluginId) { tasks.withType(KotlinCompile.class) { - compilerOptions.jvmTarget = JvmTarget.JVM_21 + compilerOptions.jvmTarget = JvmTarget.JVM_25 } } diff --git a/gradle.properties b/gradle.properties index f33e7d6..b088a7a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.caching=true rbcs.version = 0.3.7 -lys.version = 2025.12.27 +lys.version = 2026.02.19 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven docker.registry.url=gitea.woggioni.net diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60..f8e1ee3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2..37f78a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 58796f7..1d41b7c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,16 +1,5 @@ pluginManagement { repositories { -// mavenLocal { -// content { -// includeGroup 'net.woggioni.gradle' -// includeGroup 'net.woggioni.gradle.jpms-check' -// includeGroup 'net.woggioni.gradle.lombok' -// includeGroup 'net.woggioni.gradle.jdeps' -// includeGroup 'net.woggioni.gradle.sambal' -// includeGroup 'net.woggioni.gradle.graalvm.jlink' -// includeGroup 'net.woggioni.gradle.graalvm.native-image' -// } -// } maven { url = getProperty('gitea.maven.url') } @@ -30,8 +19,6 @@ dependencyResolutionManagement { versionCatalogs { catalog { from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.version') -// version('my-gradle-plugins', '2025.04.16') -// version('junit', '5.12.0') } } } @@ -46,4 +33,3 @@ include 'rbcs-client' include 'rbcs-server' include 'rbcs-servlet' include 'docker' -//include 'bug' \ No newline at end of file