Thu, 29 Dec 2022 13:58:08 +0100
update from gradle 7.3 to 7.6
And hope that this fixes an idiotic internal
duplication error
(see https://github.com/gradle/gradle/issues/17236)
151
b3f14cd4f3ab
migrate DataSourceProvider
Mike Becker <universe@uap-core.de>
parents:
147
diff
changeset
|
1 | import org.jetbrains.kotlin.gradle.tasks.KotlinCompile |
147
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | plugins { |
254
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
4 | kotlin("jvm") version "1.7.21" |
147
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | war |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | } |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | group = "de.uapcore" |
254
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
8 | version = "1.0-SNAPSHOT" |
147
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | repositories { |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | mavenCentral() |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | } |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | |
151
b3f14cd4f3ab
migrate DataSourceProvider
Mike Becker <universe@uap-core.de>
parents:
147
diff
changeset
|
14 | tasks.withType<KotlinCompile>().configureEach { |
b3f14cd4f3ab
migrate DataSourceProvider
Mike Becker <universe@uap-core.de>
parents:
147
diff
changeset
|
15 | kotlinOptions.jvmTarget = "11" |
b3f14cd4f3ab
migrate DataSourceProvider
Mike Becker <universe@uap-core.de>
parents:
147
diff
changeset
|
16 | } |
b3f14cd4f3ab
migrate DataSourceProvider
Mike Becker <universe@uap-core.de>
parents:
147
diff
changeset
|
17 | |
174
690a9aad3f16
set target JDK to 11, even if compiled with > 11
Mike Becker <universe@uap-core.de>
parents:
166
diff
changeset
|
18 | // remove after removing all java sources |
690a9aad3f16
set target JDK to 11, even if compiled with > 11
Mike Becker <universe@uap-core.de>
parents:
166
diff
changeset
|
19 | tasks.withType<JavaCompile>().configureEach { |
690a9aad3f16
set target JDK to 11, even if compiled with > 11
Mike Becker <universe@uap-core.de>
parents:
166
diff
changeset
|
20 | sourceCompatibility = "11" |
690a9aad3f16
set target JDK to 11, even if compiled with > 11
Mike Becker <universe@uap-core.de>
parents:
166
diff
changeset
|
21 | targetCompatibility = "11" |
690a9aad3f16
set target JDK to 11, even if compiled with > 11
Mike Becker <universe@uap-core.de>
parents:
166
diff
changeset
|
22 | } |
690a9aad3f16
set target JDK to 11, even if compiled with > 11
Mike Becker <universe@uap-core.de>
parents:
166
diff
changeset
|
23 | |
147
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | tasks.war { |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | archiveFileName.set("lightpit.war") |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | from("src/main/resources") |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | } |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
29 | kotlin { |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | sourceSets { |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
31 | val main by getting { |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
32 | dependencies { |
254
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
33 | // change the following to compileOnly, if you already have them on your server |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
34 | implementation("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0") |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
35 | implementation("org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1") |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
36 | implementation("org.postgresql:postgresql:42.5.1") |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
37 | compileOnly("jakarta.servlet:jakarta.servlet-api:6.0.0") |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
38 | val flexmarkVersion = "0.64.0" |
166
6eede6088d41
minimize footprint of flexmark - fixes #116
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
39 | implementation("com.vladsch.flexmark:flexmark:${flexmarkVersion}") |
6eede6088d41
minimize footprint of flexmark - fixes #116
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
40 | implementation("com.vladsch.flexmark:flexmark-util-data:${flexmarkVersion}") |
6eede6088d41
minimize footprint of flexmark - fixes #116
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
41 | implementation("com.vladsch.flexmark:flexmark-ext-tables:${flexmarkVersion}") |
6eede6088d41
minimize footprint of flexmark - fixes #116
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
42 | implementation("com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:${flexmarkVersion}") |
254
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
43 | implementation("io.github.java-diff-utils:java-diff-utils:4.12") |
147
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
44 | } |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
45 | } |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
46 | } |
dfec8c5f8db0
migrates from maven to gradle (prepares kotlin migration)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
47 | } |