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.
reason for adding this
There was a problem hiding this comment.
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.
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.
haven't we had it excluded from the build by default anyway?
There was a problem hiding this comment.
Have to ask @epamrsa.
Comment it out because the build fails with these modules.
There was a problem hiding this comment.
It will totally disable build with drill-hook. Wrong solution :)
There was a problem hiding this comment.
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.
Why was targets block deleted?
There was a problem hiding this comment.
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.
Why? Possibly this will broke build process.
There was a problem hiding this comment.
compileKotlinTask was deprecated. Let me try to rewrite with compileTaskProvider
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.
Why search by name is used instead of predefined variables (compileKotlinTask)?
There was a problem hiding this comment.
compileKotlinTask was deprecated. Let me try to rewrite with compileTaskProvider
| includeSharedLib("interceptor-hook") | ||
| includeSharedLib("interceptor-http") | ||
| // FYI: Interceptor not patched for macOS ARM64 architecture. | ||
| //includeSharedLib("interceptor-hook") |
There was a problem hiding this comment.
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.
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
|
No description provided.