hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

JDK 19 + Gradle 8.1.1 + kotlin 1.8.21 + spotless

Browse Source
This commit is contained in:
Hubert Van De Walle 2023-05-09 22:38:06 +02:00
parent 235e8b6e3c
commit 5aa2e80c5f
10 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.editorconfig
View File

@ -13,4 +13,6 @@ insert_final_newline = true
indent_size = 4 indent_size = 4
insert_final_newline = true insert_final_newline = true
max_line_length = 120 max_line_length = 120
disabled_rules = no-wildcard-imports,import-ordering ktlint_standard_no-wildcard-imports = disabled
ktlint_standard_import-ordering = disabled
ktlint_standard_multiline-if-else = disabled

4
Dockerfile
View File

@ -1,8 +1,8 @@
FROM openjdk:15-alpine as jdkbuilder FROM eclipse-temurin:19-alpine as jdkbuilder
RUN apk add --no-cache binutils RUN apk add --no-cache binutils
ENV MODULES java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.scripting,java.security.jgss,java.sql,java.sql.rowset,java.transaction.xa,java.xml,jdk.net ENV MODULES java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.scripting,java.security.jgss,java.sql,java.sql.rowset,java.transaction.xa,java.xml,jdk.net,jdk.zipfs
RUN jlink --output /myjdk --module-path $JAVA_HOME/jmods --add-modules $MODULES --no-header-files --no-man-pages --strip-debug --compress=2 RUN jlink --output /myjdk --module-path $JAVA_HOME/jmods --add-modules $MODULES --no-header-files --no-man-pages --strip-debug --compress=2

10
buildSrc/build.gradle.kts
View File

@ -7,9 +7,9 @@ repositories {
} }
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
implementation("org.jetbrains.kotlin:kotlin-serialization:1.5.0") implementation("org.jetbrains.kotlin:kotlin-serialization:1.8.21")
implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0") implementation("com.github.johnrengelman:shadow:8.1.1")
implementation("org.jlleitschuh.gradle:ktlint-gradle:10.0.0") implementation("org.jlleitschuh.gradle:ktlint-gradle:11.3.2")
implementation("com.github.ben-manes:gradle-versions-plugin:0.28.0") implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
} }

6
buildSrc/src/main/kotlin/be/simplenotes/PostcssPlugin.kt
View File

@ -2,8 +2,10 @@ package be.simplenotes
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginConvention import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.SourceSetContainer
import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.register import org.gradle.kotlin.dsl.register
import java.io.File import java.io.File
@ -17,7 +19,7 @@ class PostcssPlugin : Plugin<Project> {
getByName("processResources").dependsOn("postcss") getByName("processResources").dependsOn("postcss")
} }
val sourceSets = project.convention.getPlugin(JavaPluginConvention::class.java).sourceSets val sourceSets = project.extensions.getByType<SourceSetContainer>()
val root = File("${project.buildDir}/generated-resources/css") val root = File("${project.buildDir}/generated-resources/css")
sourceSets["main"].resources.srcDir(root) sourceSets["main"].resources.srcDir(root)
} }

6
buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts
View File

@ -12,8 +12,10 @@ group = "be.simplenotes"
version = "1.0-SNAPSHOT" version = "1.0-SNAPSHOT"
java { java {
sourceCompatibility = JavaVersion.VERSION_15 toolchain {
targetCompatibility = JavaVersion.VERSION_15 languageVersion.set(JavaLanguageVersion.of(19))
vendor.set(JvmVendorSpec.ORACLE)
}
} }
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {

12
buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts
View File

@ -1,5 +1,7 @@
package be.simplenotes package be.simplenotes
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
@ -13,14 +15,14 @@ dependencies {
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
kotlinOptions { compilerOptions {
jvmTarget = "15" jvmTarget.set(JvmTarget.JVM_19)
javaParameters = true javaParameters.set(true)
freeCompilerArgs = listOf( freeCompilerArgs.addAll(
"-Xinline-classes", "-Xinline-classes",
"-Xno-param-assertions", "-Xno-param-assertions",
"-Xno-call-assertions", "-Xno-call-assertions",
"-Xno-receiver-assertions" "-Xno-receiver-assertions",
) )
} }
} }

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx2048M -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048M -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
settings.gradle.kts
View File

@ -8,5 +8,3 @@ include(":types")
include(":persistence") include(":persistence")
include(":css") include(":css")
include(":junit-config") include(":junit-config")
enableFeaturePreview("VERSION_CATALOGS")