Skip to content

Conversation

@owlang
Copy link
Collaborator

@owlang owlang commented Apr 5, 2023

Generally streamline build process and rearchitect to match standard java project source organization. This is set-up for testing and look and feel development.

owlang added 4 commits March 9, 2023 16:24
#110

This commit includes changes that move Java source files without changing them. For clarity of commit history I will modify them in the next commit with package name updates. The project appears to still build a working JAR after moving the files without edits.

Also removed straggling .DS_Store file
#110

Package names updated to fit convention ("scriptmanager.subpackage..."). Used the following sed commands to update package statements, import statements, and the "@see" tag in the JavaDoc comments. Gradle build file configurations updated main class name to include update to package prefix.

Had to repeat these sed commands at various directory levels.
```
sed -i '' -e 's/^package /package scriptmanager./' **/*.java

sed -i '' -e 's/^import main./import scriptmanager.main./' **/*.java
sed -i '' -e 's/^import cli./import scriptmanager.cli./' **/*.java
sed -i '' -e 's/^import charts./import scriptmanager.charts./' **/*.java
sed -i '' -e 's/^import scripts./import scriptmanager.scripts./' **/*.java
sed -i '' -e 's/^import util./import scriptmanager.util./' **/*.java
sed -i '' -e 's/^import objects./import scriptmanager.objects./' **/*.java
sed -i '' -e 's/^import window_interface./import scriptmanager.window_interface./' **/*.java

sed -i '' -e 's/@see main./@see scriptmanager.main./' **/*.java
sed -i '' -e 's/@see cli./@see scriptmanager.cli./' **/*.java
sed -i '' -e 's/@see charts./@see scriptmanager.charts./' **/*.java
sed -i '' -e 's/@see scripts./@see scriptmanager.scripts./' **/*.java
sed -i '' -e 's/@see util./@see scriptmanager.util./' **/*.java
sed -i '' -e 's/@see objects./@see scriptmanager.objects./' **/*.java
sed -i '' -e 's/@see window_interface./@see scriptmanager.window_interface./' **/*.java
```
.classpath
- update to be configure by gradle (instead of manually hardcode from lib)
.project
- update to use gradle builder when using Eclipse
build.gradle
- remove sourceSets explicit assignment -- allow defaults to take over now that source is restructured to match standard file organization
- remove out-of-date 'findbugs' plugin statement and keep 'pmd' and 'checkstyle' commented for now (throw errors and warnings that are not breaking issues)
- add Shadow plugin to handle JAR building for minimized storage footprint, faster compile time, and convenient syntax.
- add explicit dependency declarations for ShadowJar command (need for Gradle 7.X to avoid warnings)
- change dependency keyword from "compile" to "implementation" per 7.5 requirements
- remove fatJar and jar task configuration (default jar called by shadowJar)

#112
build.gradle
- updated for compatibility with Gradle 7.5 (see specific list above)
gradle-wrapper.properties
- update distributionUrl to point to 7.5 zip
gradle-wrapper.jar
- update with 7.5 version
gradlew
- reinitialize with eclipse to get latest
gradlew.bat
- reinitialize with eclipse to get latest
#112

Add Java 17 back to the matrix test for github actions to test gradle upgrade.
@owlang owlang merged commit 0323fa5 into dev Apr 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants