-
Notifications
You must be signed in to change notification settings - Fork 42
Exclude manifest and module-info when creating an uber-jar #317
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
Open
fzhinkin
wants to merge
1
commit into
master
Choose a base branch
from
314-filter-module-info
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
integration/src/test/kotlin/kotlinx/benchmark/integration/JarFileTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package kotlinx.benchmark.integration | ||
|
||
import kotlin.test.Test | ||
|
||
class JarFileTest : GradleTest() { | ||
@Test | ||
fun testFilesFiltration() { | ||
val runner = project("jar-test", true) {} | ||
runner.runAndSucceed("jvmBenchmarkJar") { | ||
assertOutputDoesNotContain("Encountered duplicate path") | ||
} | ||
} | ||
} |
18 changes: 18 additions & 0 deletions
18
integration/src/test/resources/templates/jar-test/build.gradle
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
kotlin { | ||
jvm { } | ||
|
||
sourceSets { | ||
commonMain { | ||
dependencies { | ||
implementation("org.jetbrains.kotlin:kotlin-test") | ||
implementation("org.jetbrains.kotlin:kotlin-reflect") | ||
} | ||
} | ||
} | ||
} | ||
|
||
benchmark { | ||
targets { | ||
register("jvm") | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
integration/src/test/resources/templates/jar-test/gradle.properties
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 |
16 changes: 16 additions & 0 deletions
16
integration/src/test/resources/templates/jar-test/src/commonMain/kotlin/CommonBenchmark.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package test | ||
|
||
import kotlinx.benchmark.* | ||
import kotlin.math.* | ||
|
||
@State(Scope.Benchmark) | ||
@Measurement(iterations = 1, time = 1, timeUnit = BenchmarkTimeUnit.MILLISECONDS) | ||
@Warmup(iterations = 1, time = 1, timeUnit = BenchmarkTimeUnit.MILLISECONDS) | ||
@OutputTimeUnit(BenchmarkTimeUnit.MILLISECONDS) | ||
@BenchmarkMode(Mode.Throughput) | ||
open class CommonBenchmark { | ||
@Benchmark | ||
open fun mathBenchmark(): Double { | ||
return log(sqrt(3.0) * cos(3.0), 2.0) | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR is set to close #314. However, these paths don't seem to cover the conflicts reported in the issue, namely
LICENSE.txt
files in dependencies and*.kotlin_module
files. Perhaps I'm misunderstanding something but − as it stands − I don't see how this fixes the original problem.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, sorry, let me elaborate.
There are a few files that should be skipped when packing an uber-jar - neither
module-info
, nor manifests make sense for the resulting jar.Currently, the plugin doesn't skip them effectively, and that could be fixed.
For other files, in general, it's not a good idea to exclude them from jar, and I don't think the plugin can make that choice for a user here. For example,
.kotlin_module
files removal may result in reflection-related issues in runtime.If there are clashes between some files, there's a warning and you're sure that the best way to handle it is by excluding files from the resulting jar, then you can get a
Jar
task by its name (or its type) and add extra exclusion rules.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the explanation. From a user's PoV though, I think this problem is quite obscure. On non-JVM platforms that don't need an uber jar, I suspect you don't have to worry about this. But due to an internal implementation detail of
kotlinx-benchmark
on the JVM, the benchmark assembly process runs into a problem that potentially produces an invalid jar.And it's not like the current status is any better than excluding all conflicting files: there's no way to tell which source jar will win out when there are conflicts, so it's probably a case of incorrect behaviour by default.