-
Notifications
You must be signed in to change notification settings - Fork 125
Build config refactoring #89
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Build config refactoring #89
Conversation
3eb2177 to
d020c77
Compare
|
Fixed tests and rebased |
|
That's a lot of stuff. Very impressive.
What I'm not yet so convinced about is new location of the jar. Before the binary installation had a very simplistic layout (one dir with 2 files). Now the 2 files are scattered over a directory hierarchy without any obvious need (except maybe gradle convention). |
Yes, definitely. I recommend just remove version. I keep it because at least real version is better than 0.1 Will revert changes in experimental Sorry, my fault, accidentally add assert.sh and test_script.kts. I run tests locally and they generate those files
It's not indented to change for the end user, only for local testing. I will check binaries again and will keep current layout for them. |
|
To keep the installation layout as it was, gradle could copy |
|
@holgerbrandl yes, exactly, I'm already fixing this |
|
Hi @holgerbrandl. Sorry, been really busy last couple weeks. |
- Main build.gradle refactored:
- build.gradle converted to gradle/kotlin-dsl (yes, Kotlin scripting for build config of Kscript)
- Use plugins dsl instead of buildscript
- Shadow JAR file name now consistent for all versions and we avoid copy to root of the project
- Fixed project version
- Cleaned comments
- .gitignore cleanup from useless ignores
- Default lifecycle task assemble now builds shadowJar instead of jar
- Junit 4.12 (the latest bug fix release of Junit)
# Conflicts:
# .travis.yml
# build.gradle
# src/main/kotlin/kscript/app/ResolveIncludes.kt
# test/test_suite.sh
d020c77 to
018c63a
Compare
|
Time to fix this old pull request... Removed accidentally committed test files I would like also improve test script, and avoid creation of temporary files in project dir, but it seems not so easy to do, probably I will create an issue with a discussion about test suite Looks like |
|
Great PR. Thanks a lot. Especially the refac of I took the liberty to inline |
|
@holgerbrandl Okay, sure! |
This is mostly proposal for change, I refactored and simplified build.gradle of the project.
But there is also change about kscript.jar.
Main idea: do not copy kscript jar file to root of the project and use the default build dir instead, so we have simple build script and use Gradle convention.
I've updated shadow plugin (version 2.0.2 with bugfixes. 2.0.1 not available on Gradle Plugins Portal).
But I'm not that I miss nothing, please review and comment what do you think about those changes
build/libs/kscript.jar