-
Notifications
You must be signed in to change notification settings - Fork 2
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
Feature/support arm 64 epmdj 10882 #168
Conversation
….3.5, ktor version to 1.6.8, logging version to 2.1.23
NOTE: need to fix interceptor
test2code/build.gradle.kts
Outdated
@@ -69,6 +69,9 @@ tasks { | |||
withType<KotlinCompile> { | |||
kotlinOptions.jvmTarget = "1.8" | |||
} | |||
jar { | |||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE |
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.
reason for adding this
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.
If I delete it, Gradle will throw an error about being unable to override the generated sources, so I added it to fix the issue.
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.
Please double check, sources should not be overwritten during the fine configured build.
UPD: fixed
includeSharedLib("interceptor-hook") | ||
includeSharedLib("interceptor-http") | ||
// FYI: Interceptor not patched for macOS ARM64 architecture. | ||
//includeSharedLib("interceptor-hook") |
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.
haven't we had it excluded from the build by default anyway?
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.
Have to ask @epamrsa.
Comment it out because the build fails with these modules.
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.
It will totally disable build with drill-hook. Wrong solution :)
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.
as it was discussed: interceptor-hook and interceptor-http can be commented
@@ -45,19 +46,24 @@ kotlin { | |||
compilations["test"].cinterops.create("test_stubs") | |||
binaries.sharedLib(nativeAgentLibName, setOf(DEBUG)) | |||
} | |||
targets { |
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.
Why was targets block deleted?
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.
due to new kotlin versions: "The presets API is deprecated and will be removed in future releases."
@@ -145,7 +155,9 @@ kotlin { | |||
from("src/native${it.compilationName.capitalize()}/kotlin") | |||
into("src/${it.target.targetName}${it.compilationName.capitalize()}/kotlin/gen") | |||
} | |||
it.compileKotlinTask.dependsOn(copyNativeClasses.get()) |
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.
Why? Possibly this will broke build process.
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.
compileKotlinTask was deprecated. Let me try to rewrite with compileTaskProvider
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.
reworked
java-agent/build.gradle.kts
Outdated
@@ -178,6 +190,7 @@ kotlin { | |||
"mu", | |||
) | |||
val runtimeJar by registering(ShadowJar::class) { | |||
dependsOn(named<KotlinCompile>("compileKotlinJvm")) |
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.
Why search by name is used instead of predefined variables (compileKotlinTask)?
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.
compileKotlinTask was deprecated. Let me try to rewrite with compileTaskProvider
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.
reworked
includeSharedLib("interceptor-hook") | ||
includeSharedLib("interceptor-http") | ||
// FYI: Interceptor not patched for macOS ARM64 architecture. | ||
//includeSharedLib("interceptor-hook") |
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.
It will totally disable build with drill-hook. Wrong solution :)
test2code/build.gradle.kts
Outdated
@@ -69,6 +69,9 @@ tasks { | |||
withType<KotlinCompile> { | |||
kotlinOptions.jvmTarget = "1.8" | |||
} | |||
jar { | |||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE |
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.
Please double check, sources should not be overwritten during the fine configured build.
UPD: fixed
…4-EPMDJ-10882 # Conflicts: # gradle.properties # java-agent/src/nativeMain/kotlin/com/epam/drill/agent/request/jvm/RequestProcessorExternal.kt
…ture/support-arm-64-EPMDJ-10882
Quality Gate passedIssues Measures |
No description provided.