[Build, Daemon] Update native-platform dependency to 0.22-milestone-24 Platform-specific dependencies are now declared as runtime dependencies of the root artifact #KT-55271 In Progress
diff --git a/build.gradle.kts b/build.gradle.kts index 0a9d5a9..d542d85 100644 --- a/build.gradle.kts +++ b/build.gradle.kts
@@ -532,10 +532,15 @@ mavenCentral() + maven("https://repo.gradle.org/gradle/public") { // TODO: mirror the artifact to our infrastructure + content { + includeVersionByRegex("net\\.rubygrapefruit", ".+", "0\\.22-milestone-24") + } + } + @Suppress("DEPRECATION") jcenter { content { - includeVersionByRegex("net\\.rubygrapefruit", ".+", "0\\.14") includeVersionByRegex("io\\.ktor", ".+", "1\\.1\\.5") includeVersion("khttp", "khttp", "1.0.0") includeVersion("org.jetbrains.kotlinx", "kotlinx-serialization-runtime", "0.4.2")
diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts index 1b05839..5066e47 100644 --- a/compiler/daemon/daemon-client/build.gradle.kts +++ b/compiler/daemon/daemon-client/build.gradle.kts
@@ -13,7 +13,7 @@ compileOnly(libs.native.platform) embedded(project(":daemon-common")) { isTransitive = false } - embedded(libs.bundles.native.platform.all) + embedded(libs.native.platform) } tasks.withType<KotlinCompilationTask<*>> {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f1a2723..470e044 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ # Forcing gson version because of https://github.com/google/gson/pull/1991 gson = { strictly = "2.8.9" } # should be in sync with version.properties jetbrains-ideaExt = "1.0.1" -native-platform = "0.14" +native-platform = "0.22-milestone-24" [libraries] dexMemberList = { module = "com.jakewharton.dex:dex-member-list", version.ref = "dexMemberList" } @@ -36,31 +36,6 @@ jetbrains-ideaExt-gradlePlugin = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "jetbrains-ideaExt" } jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" } native-platform = { module = "net.rubygrapefruit:native-platform", version.ref = "native-platform" } -native-platform-freebsd-i386-libstdcpp = { module = "net.rubygrapefruit:native-platform-freebsd-i386-libstdcpp", version.ref = "native-platform" } -native-platform-freebsd-i386-libcpp = { module = "net.rubygrapefruit:native-platform-freebsd-i386-libcpp", version.ref = "native-platform" } -native-platform-freebsd-amd64-libstdcpp = { module = "net.rubygrapefruit:native-platform-freebsd-amd64-libstdcpp", version.ref = "native-platform" } -native-platform-freebsd-amd64-libcpp = { module = "net.rubygrapefruit:native-platform-freebsd-amd64-libcpp", version.ref = "native-platform" } -native-platform-linux-i386 = { module = "net.rubygrapefruit:native-platform-linux-i386", version.ref = "native-platform" } -native-platform-linux-amd64 = { module = "net.rubygrapefruit:native-platform-linux-amd64", version.ref = "native-platform" } -native-platform-osx-i386 = { module = "net.rubygrapefruit:native-platform-osx-i386", version.ref = "native-platform" } -native-platform-osx-amd64 = { module = "net.rubygrapefruit:native-platform-osx-amd64", version.ref = "native-platform" } -native-platform-windows-i386 = { module = "net.rubygrapefruit:native-platform-windows-i386", version.ref = "native-platform" } -native-platform-windows-amd64 = { module = "net.rubygrapefruit:native-platform-windows-amd64", version.ref = "native-platform" } [plugins] jetbrains-ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-ideaExt" } - -[bundles] -native-platform-all = [ - "native-platform", - "native-platform-freebsd-i386-libstdcpp", - "native-platform-freebsd-i386-libcpp", - "native-platform-freebsd-amd64-libstdcpp", - "native-platform-freebsd-amd64-libcpp", - "native-platform-linux-i386", - "native-platform-linux-amd64", - "native-platform-osx-i386", - "native-platform-osx-amd64", - "native-platform-windows-i386", - "native-platform-windows-amd64", -] \ No newline at end of file
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index cedb0d4..916aef6 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml
@@ -2486,94 +2486,88 @@ <sha256 value="1903bc6d87f3ab92023957b91f45a9c8eb3515bad030356ce977201e5141b724" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform" version="0.14"> - <artifact name="native-platform-0.14.jar"> - <md5 value="7d91f346c7ff91162d66f0e2428d49f6" origin="Generated by Gradle"/> - <sha256 value="bb90e26fd3968c933e5e898ba56002acdb89ba0aa836918901ef5383a3faa1f3" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform" version="0.22-milestone-24"> + <artifact name="native-platform-0.22-milestone-24.jar"> + <md5 value="c97022a5187c5d8c2d753d765972a397" origin="Generated by Gradle"/> + <sha256 value="351ee58cd0a0a3bd2912ef44b65aba7f9ef398ec65f77b595d024d9a70cbc7a8" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-freebsd-amd64-libcpp" version="0.14"> - <artifact name="native-platform-freebsd-amd64-libcpp-0.14.jar"> - <md5 value="ec1023aa967afe2049bba0ab4422bbc4" origin="Generated by Gradle"/> - <sha256 value="103d66d7d80fc8a9924955955908fbd7c03e6564bb94492305b39d87e5b01b9a" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-freebsd-amd64-libcpp" version="0.22-milestone-24"> + <artifact name="native-platform-freebsd-amd64-libcpp-0.22-milestone-24.jar"> + <md5 value="029940336ab4c9fbc022214404cafb95" origin="Generated by Gradle"/> + <sha256 value="b8c9c45b17268b408ef4cdfe71b9c9f7dea6e307360a96c84a1b50c96c671085" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-freebsd-amd64-libstdcpp" version="0.14"> - <artifact name="native-platform-freebsd-amd64-libstdcpp-0.14.jar"> - <md5 value="1b12b69c0cc28726072f1c576f258ce8" origin="Generated by Gradle"/> - <sha256 value="243cd1d6783a7a480b071beca78b6d18b164d58ca121c30cf374a38d2a9f7fff" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-linux-aarch64" version="0.22-milestone-24"> + <artifact name="native-platform-linux-aarch64-0.22-milestone-24.jar"> + <md5 value="d0bf6ee18575a65161392ddbf6b23891" origin="Generated by Gradle"/> + <sha256 value="d97c89f2bdfd6875d943ce7a6f835c804ce81425b5f75ffb740bcd65353895d9" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-freebsd-i386-libcpp" version="0.14"> - <artifact name="native-platform-freebsd-i386-libcpp-0.14.jar"> - <md5 value="266c5beb2519b644d925937b60741487" origin="Generated by Gradle"/> - <sha256 value="b4022384cece853b17175f61e8dba548778279f9db85317deb31bab0890072c5" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-linux-aarch64-ncurses5" version="0.22-milestone-24"> + <artifact name="native-platform-linux-aarch64-ncurses5-0.22-milestone-24.jar"> + <md5 value="0768155e3c301626771091cdc8ccd29e" origin="Generated by Gradle"/> + <sha256 value="e16f4a7e76242725fa73b751535453825eb772fd020adba55c3475741107c71c" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-freebsd-i386-libstdcpp" version="0.14"> - <artifact name="native-platform-freebsd-i386-libstdcpp-0.14.jar"> - <md5 value="2fce963289219110f811b8bce35d1e9c" origin="Generated by Gradle"/> - <sha256 value="29cc2a8f1407ffbdccdf8e73db989ce7304ded0e97c730d5dfd29eb7533a0781" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-linux-aarch64-ncurses6" version="0.22-milestone-24"> + <artifact name="native-platform-linux-aarch64-ncurses6-0.22-milestone-24.jar"> + <md5 value="3738f5f8a2990a75148a59f5f8d1e0a2" origin="Generated by Gradle"/> + <sha256 value="e9ade261a4cb680eca9bfbadb8fff344502ac1ee3a8d87da527b44539b9d7081" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-linux-amd64" version="0.14"> - <artifact name="native-platform-linux-amd64-0.14.jar"> - <md5 value="28f7ccd1511cea0674da15a7c3a504eb" origin="Generated by Gradle"/> - <sha256 value="3102dfc44b1ef4f0ad63cd83bc810a585c3f919a2368d968e0d2049385ea686f" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-linux-amd64" version="0.22-milestone-24"> + <artifact name="native-platform-linux-amd64-0.22-milestone-24.jar"> + <md5 value="44f8b81721400f134ad56375ebe7c621" origin="Generated by Gradle"/> + <sha256 value="123fa457ee5ca390665eeac486b7053af9fa2ca5fd0b1113b8623813f8666af5" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-linux-amd64-ncurses5" version="0.14"> - <artifact name="native-platform-linux-amd64-ncurses5-0.14.jar"> - <md5 value="9d8bd03e37429ec11790c8e7686ec16e" origin="Generated by Gradle"/> - <sha256 value="88800344f0128307b5e2efbb7239fb63e838c06441edf7d4694da0bc2e4b955b" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-linux-amd64-ncurses5" version="0.22-milestone-24"> + <artifact name="native-platform-linux-amd64-ncurses5-0.22-milestone-24.jar"> + <md5 value="897d9380e0295d44fe0c148c45088c46" origin="Generated by Gradle"/> + <sha256 value="4827a37d4328cb8f22ffd339d003c78bb20b0bdbc16d2c85c349c4f377618ba9" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-linux-amd64-ncurses6" version="0.14"> - <artifact name="native-platform-linux-amd64-ncurses6-0.14.jar"> - <md5 value="d08f17a258fe559adb21e75b44d7e1c4" origin="Generated by Gradle"/> - <sha256 value="f515ad8735d4c16f18f6ee8e98d0c65b76bdb693b62b28477f0a5af15efb182d" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-linux-amd64-ncurses6" version="0.22-milestone-24"> + <artifact name="native-platform-linux-amd64-ncurses6-0.22-milestone-24.jar"> + <md5 value="cdf97baf6454151cfb5cf90caa5f18f2" origin="Generated by Gradle"/> + <sha256 value="4dbee51ae9ca73bba487392bdd1f6cd418e778fac268b71f5ada578779c17541" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-linux-i386" version="0.14"> - <artifact name="native-platform-linux-i386-0.14.jar"> - <md5 value="e76dede5c98d284a2e6f243ec2461a1c" origin="Generated by Gradle"/> - <sha256 value="90a4788e70c296e32586d11514b666a6d58bcb4d159aca5a841617446e837313" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-osx-aarch64" version="0.22-milestone-24"> + <artifact name="native-platform-osx-aarch64-0.22-milestone-24.jar"> + <md5 value="f4d29fefe118561fcf697e7497acf873" origin="Generated by Gradle"/> + <sha256 value="00b81e5aef9ed5edddc0158a9563c3614fa214e210ac9ee75d04030b4b83a81d" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-linux-i386-ncurses5" version="0.14"> - <artifact name="native-platform-linux-i386-ncurses5-0.14.jar"> - <md5 value="6ccd6a392809e3e4ce259b5ba705ef32" origin="Generated by Gradle"/> - <sha256 value="8bf1f787fdf3b6cb59e4084ac8d98fca5c1d585fd25d35148c6b3d2d68bc8da5" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-osx-amd64" version="0.22-milestone-24"> + <artifact name="native-platform-osx-amd64-0.22-milestone-24.jar"> + <md5 value="4b1e6a6780aa2372d875038b2c2cc43c" origin="Generated by Gradle"/> + <sha256 value="a54a414ace44e7dec6929cb54f4752dd5b029f291dedd9214b3a8168466cb973" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-linux-i386-ncurses6" version="0.14"> - <artifact name="native-platform-linux-i386-ncurses6-0.14.jar"> - <md5 value="4c7d698a3ed66caf50653ed0c2a61853" origin="Generated by Gradle"/> - <sha256 value="729d6b6b7d00a6430477ecc02e3767fe4deb60b28e0e3a83b4ed485d2193b6f0" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-windows-amd64" version="0.22-milestone-24"> + <artifact name="native-platform-windows-amd64-0.22-milestone-24.jar"> + <md5 value="1b7224b5f7087dbf8128eb1161210266" origin="Generated by Gradle"/> + <sha256 value="5222f23d61304a4c84820785dd8660f04df05014726d222ac90757dd1f313b69" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-osx-amd64" version="0.14"> - <artifact name="native-platform-osx-amd64-0.14.jar"> - <md5 value="3fba796ab8521871b7845447b09a96bc" origin="Generated by Gradle"/> - <sha256 value="1f7f41f174c351ada0ba9571327a1f8945931523fe440a19a2c385f9cd2ffc2e" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-windows-amd64-min" version="0.22-milestone-24"> + <artifact name="native-platform-windows-amd64-min-0.22-milestone-24.jar"> + <md5 value="7079abc155542d12f690000d7bc0d226" origin="Generated by Gradle"/> + <sha256 value="50447aedd6ead8ebbeb43e0aa0debc39e90ff5465abd716367048380408d11df" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-osx-i386" version="0.14"> - <artifact name="native-platform-osx-i386-0.14.jar"> - <md5 value="8398ad265e4918a942ea3194e2db101e" origin="Generated by Gradle"/> - <sha256 value="01d3b3f0d369a7a1f8774ac182d0e372792d01d84b745f94b99c2464c68bb843" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-windows-i386" version="0.22-milestone-24"> + <artifact name="native-platform-windows-i386-0.22-milestone-24.jar"> + <md5 value="581804e5501cbdb47ef486b6f12ad823" origin="Generated by Gradle"/> + <sha256 value="79b1d5e02fa86ba91ba288650c4ba564599eb6b4422c29c8eb202886262302a3" origin="Generated by Gradle"/> </artifact> </component> - <component group="net.rubygrapefruit" name="native-platform-windows-amd64" version="0.14"> - <artifact name="native-platform-windows-amd64-0.14.jar"> - <md5 value="8db4d2c2fe54ba15b2ea6e274dcc0c84" origin="Generated by Gradle"/> - <sha256 value="d02b373c33c33aee1e8b0e15ef341daace3d9940b763a0703ad6ea9fb0650db9" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="net.rubygrapefruit" name="native-platform-windows-i386" version="0.14"> - <artifact name="native-platform-windows-i386-0.14.jar"> - <md5 value="086ee366d48c0bed364aa7799ee79fc9" origin="Generated by Gradle"/> - <sha256 value="2e8ece4694c8e236f2f01568d653ec4f8e065af2838c8551d5927710c9fb7e8d" origin="Generated by Gradle"/> + <component group="net.rubygrapefruit" name="native-platform-windows-i386-min" version="0.22-milestone-24"> + <artifact name="native-platform-windows-i386-min-0.22-milestone-24.jar"> + <md5 value="56344a8fec8fe96f85fc7498d5d510dc" origin="Generated by Gradle"/> + <sha256 value="f686696cdd8af95c4b0691c71cf41133fd9977910c28a42c82faabc9c1c6cf93" origin="Generated by Gradle"/> </artifact> </component> <component group="net.sf.jopt-simple" name="jopt-simple" version="4.6">