Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
291 commits
Select commit Hold shift + click to select a range
ba0afc5
#1: Add 'BoundsDAO' class.
jenetics Jan 6, 2017
9d095ea
#1: Improve data model.
jenetics Jan 6, 2017
552d5ae
#1: Simplify DB creation script.
jenetics Jan 7, 2017
6caedb5
#1: Add 'ResultSet' delegate class.
jenetics Jan 7, 2017
9040610
#1: Code improvements.
jenetics Jan 7, 2017
1f1c628
#1: Code improvements.
jenetics Jan 8, 2017
b768bd5
Merge remote-tracking branch 'origin/r1.1.0' into issues/JPX-1-JDBC_a…
jenetics Jan 8, 2017
aba6f54
Merge remote-tracking branch 'origin/r1.1.0' into issues/JPX-1-JDBC_a…
jenetics Jan 9, 2017
c63eaeb
#1: Code improvements.
jenetics Jan 9, 2017
1fe601c
#1: Implement MetadataDAO.insert method.
jenetics Jan 9, 2017
5866f40
#1: Implement 'MetadataDAO' object.
jenetics Jan 9, 2017
75c3b8c
#1: Move 'ListMapper' and 'OptionMapper' to top level.
jenetics Jan 9, 2017
6de17b2
#1: Improve DB creation scripts.
jenetics Jan 9, 2017
c5add1b
#1: Organize imports.
jenetics Jan 9, 2017
c943b4b
#1: Implement 'WayPointDAO' object.
jenetics Jan 10, 2017
22cb443
#1: Implement 'RouteDAO'.
jenetics Jan 10, 2017
1239968
#1: Implement 'TrackSegmentDAO'.
jenetics Jan 11, 2017
4541446
#1: Add DAO classes.
jenetics Jan 11, 2017
6511570
#1: Implement 'TrackLinkDAO'.
jenetics Jan 11, 2017
fc914d3
#1: Implement 'GPXDAO' object.
jenetics Jan 11, 2017
6f34832
#1: Improving 'LinkDAO' object.
jenetics Jan 11, 2017
0faa238
#1: Improve LinkDAO testint.
jenetics Jan 12, 2017
8ce2113
#1: Extracting common code.
jenetics Jan 12, 2017
023d877
#1: Fix copyright info.
jenetics Jan 12, 2017
9c6577c
#1: Code improvements.
jenetics Jan 12, 2017
9848ab1
#1: Code cleanup.
jenetics Jan 12, 2017
8044c4b
#1: Improve DAO tests.
jenetics Jan 12, 2017
7d10af5
#1: Improve DB model.
jenetics Jan 12, 2017
c2414eb
#1: Implement 'CopyrightDAO'.
jenetics Jan 13, 2017
81f2228
#1: Implement 'CopyrightDAO'.
jenetics Jan 13, 2017
12c454a
#1: Implement 'CopyrightDAO'.
jenetics Jan 13, 2017
51307ef
#1: Implement 'BoundsDAO' object.
jenetics Jan 13, 2017
3250fa6
#1: Implement 'MetadataDAO'.
jenetics Jan 13, 2017
63862be
#1: Fix equals method of Metadata.
jenetics Jan 13, 2017
b3c85ed
#1: Implement 'MetadataDAOTest' class.
jenetics Jan 13, 2017
a770833
#1: Implement 'MetadataDAOTest' class.
jenetics Jan 13, 2017
7e2a7f1
#1: Simplify code.
jenetics Jan 13, 2017
4e37ec7
#1: Organize imports.
jenetics Jan 13, 2017
afe8ec6
#1: Rename interface 'DeleteBy' to 'Delete'.
jenetics Jan 13, 2017
2739fe6
#1: Simplify code.
jenetics Jan 13, 2017
a71af7d
#1: Extract 'MetadataLink.Row' class.
jenetics Jan 13, 2017
2265863
Merge remote-tracking branch 'origin/r1.1.0' into issues/JPX-1-JDBC_a…
jenetics Jan 13, 2017
ef89b29
#1: Implement 'WayPointDAO' class.
jenetics Jan 14, 2017
91a44ba
#1: Implement 'RouteDAO'.
jenetics Jan 14, 2017
b2ccc21
#1: Experimental classes.
jenetics Jan 14, 2017
b7962f6
#1: Experimental classes.
jenetics Jan 14, 2017
381cd90
#1: Move 'AbstractQuery' into internal package.
jenetics Jan 14, 2017
7f0bb28
#1: Move 'BatchQuery' into internal package.
jenetics Jan 14, 2017
b1de916
#1: Move 'Column' into internal package.
jenetics Jan 14, 2017
3a14613
#1: Move 'DAO' into internal package.
jenetics Jan 14, 2017
e5b2374
#1: Move 'Delete' into internal package.
jenetics Jan 14, 2017
13749bc
#1: Move 'Diff' into internal package.
jenetics Jan 14, 2017
19584b6
#1: Move 'Insert' into internal package.
jenetics Jan 14, 2017
a7c9385
#1: Move 'ListMapper' into internal package.
jenetics Jan 14, 2017
5a4dcc0
#1: Move 'OptionMapper' into internal package.
jenetics Jan 14, 2017
139e3df
#1: Move 'Pair' into internal package.
jenetics Jan 14, 2017
8495224
#1: Move 'Param' into internal package.
jenetics Jan 14, 2017
ce27901
#1: Move 'Results' into internal package.
jenetics Jan 14, 2017
eadc83e
#1: Move 'RowParser' into internal package.
jenetics Jan 14, 2017
c166739
#1: Move 'SelectBy' into internal package.
jenetics Jan 14, 2017
800bd23
#1: Move 'SQL' into internal package.
jenetics Jan 14, 2017
c22ecd4
#1: Move 'SQLQuery' into internal package.
jenetics Jan 14, 2017
02580d8
#1: Move 'Stored' into internal package.
jenetics Jan 14, 2017
25938b7
#1: Move 'Tuple3' into internal package.
jenetics Jan 14, 2017
08281fb
#1: Move 'Update' into internal package.
jenetics Jan 14, 2017
368d33b
#1: Move 'PrepareSQL' into internal package.
jenetics Jan 14, 2017
6626b3e
#1: Move 'Lists' into internal package.
jenetics Jan 14, 2017
b38ab8e
#1: Fix visibility after refactorings.
jenetics Jan 14, 2017
ba268c0
#1: Prototype implementation.
jenetics Jan 15, 2017
a9dc797
Merge remote-tracking branch 'origin/master' into issues/JPX-1-JDBC_a…
jenetics Jan 10, 2018
902dc95
#1: Fix build file.
jenetics Jan 10, 2018
65a0b04
#1: Fix tests.
jenetics Jan 10, 2018
771af19
#1: Fix Javadoc.
jenetics Jan 10, 2018
e2de6cd
Merge remote-tracking branch 'origin/master' into issues/JPX-1-JDBC_a…
jenetics Jan 29, 2018
a909802
Merge remote-tracking branch 'origin/master' into issues/JPX-1-JDBC_a…
jenetics Jan 29, 2018
4f6d3d6
#1: Temporary commenting tests.
jenetics Jan 29, 2018
7b8de6b
Merge remote-tracking branch 'origin/r1.3.0' into issues/JPX-1-JDBC_a…
jenetics Mar 18, 2018
ed85bcd
#1: Some refactorings.
jenetics Mar 18, 2018
fda8d36
#1: Some interface renaming.
jenetics Mar 18, 2018
443c38c
#1: Some refactorings.
jenetics Mar 19, 2018
27e840f
Merge remote-tracking branch 'origin/master' into issues/JPX-1-JDBC_a…
jenetics Sep 20, 2018
2db6fba
#1: Add 'Lombok' dependency.
jenetics Sep 20, 2018
a98f93b
#1: Lombok builder.
jenetics Sep 23, 2018
d795de4
Merge remote-tracking branch 'origin/master' into issues/JPX-1-JDBC_a…
jenetics Aug 29, 2019
7472a5a
#1: Make it compile again.
jenetics Aug 29, 2019
0153785
#1: Some SQL testing.
jenetics Aug 29, 2019
49dcb56
#1: Fix copyright header.
jenetics Aug 29, 2019
a963b47
#1: Add 'SqlFunction' interface.
jenetics Aug 29, 2019
e55e9f0
#1: Some code reformatting.
jenetics Aug 29, 2019
e0e47db
#1: 'SQL' class is no longer needed.
jenetics Aug 29, 2019
5fd1697
#1: Add main entry point.
jenetics Aug 29, 2019
d3be7d0
#1: Add query class stub.
jenetics Aug 29, 2019
524d55d
#1: Move 'Param' class into 'anorm' package.
jenetics Aug 29, 2019
643a55e
#1: Improve code structure.
jenetics Aug 29, 2019
9904c2a
#1: Implement query parsing.
jenetics Aug 29, 2019
e904412
#1: Add 'QueryTest' class.
jenetics Aug 29, 2019
291e118
#1: Organize imports.
jenetics Aug 29, 2019
60ef16a
#1: Some refactorings.
jenetics Aug 29, 2019
09bfa5f
#1: API tests.
jenetics Aug 29, 2019
a7bfaaf
#1: Fix parameter name.
jenetics Aug 30, 2019
b931247
#1: Rename package 'anorm' to 'querily'.
jenetics Aug 30, 2019
b9ab886
#1: Add stubs for execution methods.
jenetics Aug 30, 2019
0754965
#1: Move 'RowParser' and 'Results' class to 'querily' package.
jenetics Aug 30, 2019
36e2820
#1: Static factories.
jenetics Aug 30, 2019
2dd6967
#1: Add 'execute' method.
jenetics Aug 30, 2019
8306424
#1: Rename test class.
jenetics Aug 30, 2019
d2540e8
#1: Implement 'executeInsert' method.
jenetics Aug 30, 2019
461e028
#1: Move 'Stored' class to 'querily' package.
jenetics Aug 30, 2019
6bacfeb
#1: Some code cleanup.
jenetics Aug 30, 2019
fdab901
#1: 'RowParser' refactoring.
jenetics Aug 30, 2019
4229f3f
#1: Cleanup 'Row' class.
jenetics Aug 31, 2019
9157a5b
#1: Implement 'Row' class.
jenetics Aug 31, 2019
8b36a38
#1: API cleanup.
jenetics Aug 31, 2019
a750c89
#1: Remove no longer needed class.
jenetics Aug 31, 2019
25502fc
#1: Add Javadoc.
jenetics Sep 1, 2019
a034ce7
#1: Implement 'PreparedQuery'.
jenetics Sep 1, 2019
cf92c5c
#1: Rename 'Query' to 'SimpleQuery'.
jenetics Sep 1, 2019
95a63dd
#1: Introduce 'Query' interface.
jenetics Sep 1, 2019
43f886e
#1: Implement 'Query' interface.
jenetics Sep 1, 2019
fdd904e
#1: 'SimpleQuery' implements 'Query' interface.
jenetics Sep 1, 2019
81a3034
#1: Some design experiments.
jenetics Sep 1, 2019
1831596
#1: Some code cleanup.
jenetics Sep 1, 2019
98267eb
#1: Fix copyright header.
jenetics Sep 1, 2019
b22f959
#1: Implement 'Dctor' class.
jenetics Sep 1, 2019
111b610
#1: Refactor 'Query' interface to abstract class.
jenetics Sep 2, 2019
3d0cd1e
#1: Query refactorings.
jenetics Sep 2, 2019
bc0a1d1
#1: Query refactorings.
jenetics Sep 2, 2019
6f0637b
#1: Implement batch insertion.
jenetics Sep 3, 2019
9b8ac50
#1: Remove 'SimpleQuery' class.
jenetics Sep 3, 2019
28decc3
#1: Rename query tests.
jenetics Sep 3, 2019
49dc159
#1: Implement 'PreparedQuery' class.
jenetics Sep 3, 2019
feed8b1
#1: Refactoring of 'Value' class.
jenetics Sep 3, 2019
fb13fb3
#1: API streamlining.
jenetics Sep 3, 2019
0b83196
#1: Implement 'LinkDAO'.
jenetics Sep 4, 2019
09e70bb
#1: Implement 'PersonDAO'.
jenetics Sep 4, 2019
62be094
#1: Fix DDL script.
jenetics Sep 5, 2019
80b9353
#1: Improve insertion queries.
jenetics Sep 5, 2019
b5f70fa
#1: Move 'CopyrightDAO' to 'dao' package.
jenetics Sep 5, 2019
88132a6
#1: Implement 'CopyrightDAO'.
jenetics Sep 5, 2019
789e9dc
#1: Implement inserts.
jenetics Sep 5, 2019
d2a8b8b
#1: Extend 'Dctor' class.
jenetics Sep 6, 2019
227c3d0
#1: Implementing.
jenetics Sep 6, 2019
563e136
#1: Implementing.
jenetics Sep 6, 2019
e6b3a10
#1: Implement 'WayPointAccess'.
jenetics Sep 6, 2019
6571a22
#1: Implement 'RouteAccess'.
jenetics Sep 6, 2019
0535679
#1: Implement 'TrackSegmentAccess'.
jenetics Sep 6, 2019
fb56cf6
#1: Implement 'TrackAccess'.
jenetics Sep 6, 2019
1523e60
#1: Implement 'GPXAccess'.
jenetics Sep 6, 2019
585b187
#1: Write insert code and fix accessors.
jenetics Sep 6, 2019
c61b768
#1: Fix model for real MariaDB.
jenetics Sep 6, 2019
2862696
#1: Cleanup of old DB classes.
jenetics Sep 6, 2019
529500a
#1: Move accessor class to module base package.
jenetics Sep 6, 2019
1be9f06
#1: Cleanup.
jenetics Sep 6, 2019
8691205
#1: Cleanup.
jenetics Sep 6, 2019
9be5307
#1: Rename 'Query.executeInsert' to 'inserts'.
jenetics Sep 6, 2019
40aea1e
#1: Cleanup.
jenetics Sep 6, 2019
7ae8e60
#1: Cleanup.
jenetics Sep 6, 2019
748b2b7
#1: Improve error messages.
jenetics Sep 6, 2019
4303647
#1: Add missing column.
jenetics Sep 6, 2019
4232001
#1: Remove code duplications.
jenetics Sep 6, 2019
dcab4ea
#1: Fix 'BoundsAccess'.
jenetics Sep 6, 2019
9d3e2f2
#1: Fix person constraint.
jenetics Sep 6, 2019
90d6fb6
#1: Impl.
jenetics Sep 7, 2019
9262a52
Merge remote-tracking branch 'origin/r1.6.0' into issues/JPX-1-JDBC_a…
jenetics Sep 9, 2019
1bb039b
#1: Improve data model.
jenetics Sep 9, 2019
cc577c9
#1: Improve DB model.
jenetics Sep 11, 2019
d164191
#1: Add Docker Compose file for local PostgreSQL DB.
jenetics Sep 11, 2019
ef9c0af
#1: Docker setup.
jenetics Sep 11, 2019
54af2bb
#1: Add pgAdimin config.
jenetics Sep 11, 2019
2c3be65
#1: Ignore data directories.
jenetics Sep 11, 2019
85c2725
#1: PSQL tests.
jenetics Sep 11, 2019
5af5ef9
#1: Add model script for PSQL.
jenetics Sep 11, 2019
194da65
#1: Improve access classes.
jenetics Sep 11, 2019
cbde990
#1: Improve model types.
jenetics Sep 12, 2019
ee037c0
#1: Minor code improvements.
jenetics Sep 12, 2019
77aa4b3
#1: Fix object conversion.
jenetics Sep 12, 2019
d409053
#1: Fix 'prepare' method.
jenetics Sep 12, 2019
1269ed0
#1: Fix visibility.
jenetics Sep 12, 2019
0879c68
#1: Fix Longitude range.
jenetics Sep 13, 2019
585a309
Fix Javadoc.
jenetics Sep 13, 2019
468a0dd
Merge remote-tracking branch 'origin/master' into issues/JPX-1-JDBC_a…
jenetics Oct 29, 2019
217c426
#1: Using 'facilejdbc' library.
jenetics Nov 8, 2019
6a15a12
Update to Java 11.
jenetics Nov 8, 2019
6aeb100
#1: Define composite build.
jenetics Nov 8, 2019
8dfa7cf
Fix query strings.
jenetics Nov 8, 2019
33a2a46
#1: Implement GPX type to SQL type mapper.
jenetics Nov 8, 2019
e9bde8d
#1: Implement GPX type to SQL type mapper.
jenetics Nov 8, 2019
6272b37
#1: Implement type mapper.
jenetics Nov 8, 2019
46a9656
#1: Add select queries.
jenetics Nov 8, 2019
1f3db01
#1: Add select queries.
jenetics Nov 8, 2019
cb5344a
#1: Adapt 'RowParser' interfaces.
jenetics Nov 9, 2019
963ea01
#1: Disable integration test.
jenetics Nov 10, 2019
73c9c31
#1: Update 'facilejdbc' version number to 0.3.0.
jenetics Nov 10, 2019
be6890d
#1: Remove Java 8 compatibility.
jenetics Nov 10, 2019
32e6aad
#1: Minor code improvements.
jenetics Dec 10, 2019
ff994cd
Adding some tooling classes.
jenetics Dec 28, 2019
5f252f5
Adding some tooling classes.
jenetics Dec 28, 2019
84932f3
Splitting tracks.
jenetics Dec 28, 2019
f2dc525
Fix 'Tracks.toTrack' method.
jenetics Dec 28, 2019
14b49d2
Improve tooling.
jenetics Dec 28, 2019
a3c2119
Fix bounds calculation.
jenetics Dec 28, 2019
416bba5
Improve normalizer.
jenetics Dec 28, 2019
652dce2
Improve normalizer.
jenetics Dec 28, 2019
0c3040f
Improve normalizer.
jenetics Dec 28, 2019
df176f3
Improve normalizer.
jenetics Dec 28, 2019
adf6632
Streamlining of 'Track' collector.
jenetics Dec 28, 2019
f6d0c60
Add pre-condition check.
jenetics Dec 29, 2019
3b6a293
Filter improvements.
jenetics Dec 30, 2019
74a2c9e
Merge remote-tracking branch 'origin/r1.6.1' into issues/JPX-1-JDBC_a…
jenetics Dec 30, 2019
13634c1
Minor improvements.
jenetics Jan 6, 2020
5fd1270
Merge remote-tracking branch 'origin/master' into issues/JPX-1-JDBC_a…
jenetics Sep 13, 2020
28aa5c4
Implement TCX splitter.
jenetics Nov 12, 2020
2f83f7c
#1: Change path.
jenetics Jan 18, 2021
169059d
#1: Remove DB files.
jenetics Aug 25, 2021
cda622c
#1: Some tests.
jenetics Nov 12, 2021
0e30e28
Merge remote-tracking branch 'origin/releases/r3.0.0' into issues/JPX…
jenetics Dec 31, 2021
e6447d7
Merge remote-tracking branch 'origin/master' into issues/JPX-1-JDBC_a…
jenetics Jul 10, 2022
77e9caf
#1: Add tracksegment splitter example.
jenetics Jul 12, 2022
fc96c6b
#1: Fix typo.
jenetics Jan 8, 2023
f0ce2ed
Update version string to '4.0.0-SNAPSHOT'.
jenetics Nov 7, 2023
75d5d7e
Remove Java 17 from build.
jenetics Nov 7, 2023
b48a91e
#174: Update to Java 21.
jenetics Nov 7, 2023
f35146e
#174: Update compiler warning flags.
jenetics Nov 7, 2023
62a2ede
#174: Extract version catalog to toml file.
jenetics Nov 7, 2023
eaa3bfe
#174: Use Javadoc code snippets.
jenetics Nov 7, 2023
5eaa9fc
#174: Remove unused plugin.
jenetics Nov 7, 2023
87be51d
#174: Improve Javadoc.
jenetics Nov 7, 2023
aaf2335
Merge pull request #176 from jenetics/issues/JPX-174-Java21
jenetics Nov 7, 2023
407040d
#177: Convert 'geom' classes to records.
jenetics Nov 7, 2023
db19f84
#177: Refactor to sealed types.
jenetics Nov 7, 2023
4120445
Merge pull request #178 from jenetics/issues/JPX-177-Convert_'geom'_c…
jenetics Nov 7, 2023
1dc1e39
Update version placeholder.
jenetics Nov 8, 2023
204c335
Improve Javadoc.
jenetics Nov 8, 2023
a5f0ef0
Merge branch 'releases/r4.0.0' into issues/JPX-1-JDBC_access
jenetics Nov 11, 2023
619af7b
#1: Convert sub-project to Kotlin script.
jenetics Nov 11, 2023
b5f8ebd
#1: Make 'jpx.jdbc' module compile.
jenetics Nov 11, 2023
aa9da5e
#1: Additional test case.
jenetics Nov 13, 2023
dfbbf11
#1: Code improvements.
jenetics Nov 13, 2023
f6307ac
Merge branch 'master' into releases/r4.0.0
jenetics Nov 16, 2024
db19cd0
Update used libraries.
jenetics Nov 16, 2024
5d23159
Merge branch 'master' into issues/JPX-1-JDBC_access
jenetics Aug 24, 2025
8c2bc0d
#1: Update build.
jenetics Aug 24, 2025
f0f1ddb
#1: Update dependencies.
jenetics Aug 24, 2025
8ca1e95
Update Gradle to 9.0.
jenetics Aug 24, 2025
9c09015
Update dependency management.
jenetics Aug 24, 2025
d7bd5af
Update gradle.yml
jenetics Aug 24, 2025
97af57a
Upgrade publishing scripts.
jenetics Aug 24, 2025
eb93090
Merge branch 'master' into releases/r4.0.0
jenetics Aug 24, 2025
cf29d66
Merge branch 'releases/r4.0.0' into issues/JPX-1-JDBC_access
jenetics Aug 24, 2025
b149b30
#1: Make it compile again.
jenetics Aug 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
root = true

[*]
[*.{java,gradle,groovy}]
charset = utf-8
indent_style = tab
indent_size = 4
tab_width = 4
trim_trailing_whitespace = true
insert_final_newline = true


[*.{java,gradle,groovy,kt,kts}]
trim_trailing_whitespace = true
insert_final_newline = true

[*.yml]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
insert_final_newline = true
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
java-version: [ 17, 21, 23 ]
java-version: [ 21, 24 ]
steps:
- uses: actions/checkout@v2

Expand All @@ -27,4 +27,4 @@ jobs:
java-version: ${{ matrix.java-version }}
distribution: 'zulu'
- name: Build with Gradle
run: ./gradlew build --stacktrace --info
run: ./gradlew build --stacktrace --info
112 changes: 45 additions & 67 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import io.jenetics.gradle.dsl.isModule
import io.jenetics.gradle.dsl.moduleName
import org.apache.tools.ant.filters.ReplaceTokens

/*
* Java GPX Library (@__identifier__@).
Expand All @@ -9,7 +10,7 @@ import io.jenetics.gradle.dsl.moduleName
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -18,7 +19,7 @@ import io.jenetics.gradle.dsl.moduleName
* limitations under the License.
*
* Author:
* Franz Wilhelmstötter (franz.wilhelmstoetter@gmail.com)
* Franz Wilhelmstötter (franz.wilhelmstoetter@gmail.com)
*/

/**
Expand All @@ -28,13 +29,13 @@ import io.jenetics.gradle.dsl.moduleName
*/
plugins {
base
id("me.champeau.jmh") version "0.7.2" apply false
alias(libs.plugins.version.catalog.update)
}

rootProject.version = JPX.VERSION

tasks.named<Wrapper>("wrapper") {
version = "8.11"
version = "9.0.0"
distributionType = Wrapper.DistributionType.ALL
}

Expand Down Expand Up @@ -71,8 +72,8 @@ gradle.projectsEvaluated {

plugins.withType<JavaPlugin> {
configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

configure<JavaPluginExtension> {
Expand Down Expand Up @@ -169,13 +170,12 @@ fun setupJavadoc(project: Project) {
doclet.charSet = "UTF-8"
doclet.linkSource(true)
doclet.linksOffline(
"https://docs.oracle.com/en/java/javase/17/docs/api/",
"https://docs.oracle.com/en/java/javase/21/docs/api/",
"${project.rootDir}/buildSrc/resources/javadoc/java.se"
)
doclet.windowTitle = "JPX ${project.version}"
doclet.docTitle = "<h1>JPX ${project.version}</h1>"
doclet.bottom = "&copy; ${Env.COPYRIGHT_YEAR} Franz Wilhelmst&ouml;tter &nbsp;<i>(${Env.BUILD_DATE})</i>"
doclet.stylesheetFile = project.file("${project.rootDir}/buildSrc/resources/javadoc/stylesheet.css")

doclet.tags = listOf(
"apiNote:a:API Note:",
Expand All @@ -193,38 +193,6 @@ fun setupJavadoc(project: Project) {
}
}
}

val javadoc = project.tasks.findByName("javadoc") as Javadoc?
if (javadoc != null) {
project.tasks.register<io.jenetics.gradle.ColorizerTask>("colorizer") {
directory = javadoc.destinationDir!!
}

project.tasks.register("java2html") {
doLast {
providers.javaexec {
mainClass.set("de.java2html.Java2Html")
args = listOf(
"-srcdir", "src/main/java",
"-targetdir", "${javadoc.destinationDir}/src-html/${project.extra["moduleName"]}"
)
classpath = files("${project.rootDir}/buildSrc/lib/java2html.jar")
}
}
}

javadoc.doLast {
val colorizer = project.tasks.findByName("colorizer")
colorizer?.actions?.forEach {
it.execute(colorizer)
}

val java2html = project.tasks.findByName("java2html")
java2html?.actions?.forEach {
it.execute(java2html)
}
}
}
}

/**
Expand All @@ -242,13 +210,18 @@ fun xlint(): String {
"empty",
"exports",
"finally",
"lossy-conversions",
"module",
"opens",
"overrides",
"rawtypes",
"removal",
"serial",
// "serial",
"static",
"strictfp",
"synchronization",
"text-blocks",
"this-escape",
"try",
"unchecked",
"varargs"
Expand All @@ -257,6 +230,9 @@ fun xlint(): String {

val identifier = "${JPX.ID}-${JPX.VERSION}"

/**
* Setup of the Maven publishing.
*/
/**
* Setup of the Maven publishing.
*/
Expand All @@ -268,26 +244,29 @@ fun setupPublishing(project: Project) {

project.tasks.named<Jar>("sourcesJar") {
filter(
org.apache.tools.ant.filters.ReplaceTokens::class, "tokens" to mapOf(
"__identifier__" to identifier,
"__year__" to Env.COPYRIGHT_YEAR
)
ReplaceTokens::class, "tokens" to mapOf(
"__identifier__" to identifier,
"__year__" to Env.COPYRIGHT_YEAR
)
)
}

project.tasks.named<Jar>("javadocJar") {
filter(
org.apache.tools.ant.filters.ReplaceTokens::class, "tokens" to mapOf(
"__identifier__" to identifier,
"__year__" to Env.COPYRIGHT_YEAR
)
ReplaceTokens::class, "tokens" to mapOf(
"__identifier__" to identifier,
"__year__" to Env.COPYRIGHT_YEAR
)
)
}

project.configure<PublishingExtension> {
publications {
create<MavenPublication>("mavenJava") {
artifactId = JPX.ID
suppressPomMetadataWarningsFor("testFixturesApiElements")
suppressPomMetadataWarningsFor("testFixturesRuntimeElements")

artifactId = project.name
from(project.components["java"])
versionMapping {
usage("java-api") {
Expand Down Expand Up @@ -327,24 +306,23 @@ fun setupPublishing(project: Project) {
}
repositories {
maven {
url = if (version.toString().endsWith("SNAPSHOT")) {
uri(Maven.SNAPSHOT_URL)
} else {
uri(Maven.RELEASE_URL)
}
url = if (version.toString().endsWith("SNAPSHOT"))
uri(layout.buildDirectory.dir("repos/snapshots"))
else
uri(layout.buildDirectory.dir("repos/releases"))
}
}

credentials {
username = if (extra.properties["nexus_username"] != null) {
extra.properties["nexus_username"] as String
} else {
"nexus_username"
}
password = if (extra.properties["nexus_password"] != null) {
extra.properties["nexus_password"] as String
} else {
"nexus_password"
}
}
// Exclude test fixtures from publication, as we use them only internally
plugins.withId("org.gradle.java-test-fixtures") {
val component = components["java"] as AdhocComponentWithVariants
component.withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() }
component.withVariantsFromConfiguration(configurations["testFixturesRuntimeElements"]) { skip() }

// Workaround to not publish test fixtures sources added by com.vanniktech.maven.publish plugin
// TODO: Remove as soon as https://github.com/vanniktech/gradle-maven-publish-plugin/issues/779 closed
afterEvaluate {
component.withVariantsFromConfiguration(configurations["testFixturesSourcesElements"]) { skip() }
}
}
}
Expand Down
14 changes: 0 additions & 14 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

/*
* Java GPX Library (@__identifier__@).
* Copyright (c) @__year__@ Franz Wilhelmstötter
Expand Down Expand Up @@ -35,14 +32,3 @@ repositories {
mavenLocal()
gradlePluginPortal()
}

tasks.withType<KotlinCompile> {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
4 changes: 1 addition & 3 deletions buildSrc/resources/javadoc/java.se/element-list
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ java.io
java.lang
java.lang.annotation
java.lang.constant
java.lang.foreign
java.lang.invoke
java.lang.module
java.lang.ref
Expand Down Expand Up @@ -221,12 +222,9 @@ module:jdk.hotspot.agent
module:jdk.httpserver
com.sun.net.httpserver
com.sun.net.httpserver.spi
module:jdk.incubator.foreign
jdk.incubator.foreign
module:jdk.incubator.vector
jdk.incubator.vector
module:jdk.jartool
com.sun.jarsigner
jdk.security.jarsigner
module:jdk.javadoc
jdk.javadoc.doclet
Expand Down
Loading
Loading