Fix zstd resolution

breskeby · breskeby · commit bc8e3ed0ea85 · 2025-07-03T16:51:57.000+02:00
diff --git a/distribution/build.gradle b/distribution/build.gradle
@@ -357,7 +357,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
         into('platform') {
           from(configurations.libsNative)
           if (os != null) {
-            include (os + '-' + architecture + '/*')
+            include (os + '-' + architecture.classifier + '/*')
           }
         }
         into('entitlement-agent') {
diff --git a/libs/native/libraries/build.gradle b/libs/native/libraries/build.gradle
@@ -60,7 +60,7 @@ def extractLibs = tasks.register('extractLibs', Copy) {
   from configurations.libs
   // TODO: fix architecture in uploaded libs
   filesMatching("*-x86-64/*") {
-    it.path = it.path.replace("x86-64", "x64")
+    it.path = it.path.replace("x86-64", "amd64")
   }
   filesMatching("win32*/*") {
     it.path = it.path.replace("win32", "windows")

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {`
`357`	`357`	`into('platform') {`
`358`	`358`	`from(configurations.libsNative)`
`359`	`359`	`if (os != null) {`
`360`		`- include (os + '-' + architecture + '/*')`
	`360`	`+ include (os + '-' + architecture.classifier + '/*')`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`	`into('entitlement-agent') {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ def extractLibs = tasks.register('extractLibs', Copy) {`
`60`	`60`	`from configurations.libs`
`61`	`61`	`// TODO: fix architecture in uploaded libs`
`62`	`62`	`filesMatching("-x86-64/") {`
`63`		`- it.path = it.path.replace("x86-64", "x64")`
	`63`	`+ it.path = it.path.replace("x86-64", "amd64")`
`64`	`64`	`}`
`65`	`65`	`filesMatching("win32/") {`
`66`	`66`	`it.path = it.path.replace("win32", "windows")`