Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/src/main/java/gradlebuild/JniPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void createPlatforms(PlatformContainer platformContainer) {
addPlatform(platformContainer, "osx_aarch64", "osx", "aarch64");
addPlatform(platformContainer, "linux_amd64", "linux", "amd64");
addPlatform(platformContainer, "linux_aarch64", "linux", "aarch64");
addPlatform(platformContainer, "linux_riscv64", "linux", "riscv64");
// addPlatform(platformContainer, "linux_riscv64", "linux", "riscv64"); // needs https://github.com/gradle/native-platform/issues/387
addPlatform(platformContainer, "windows_i386", "windows", "i386");
addPlatform(platformContainer, "windows_amd64", "windows", "amd64");
addPlatform(platformContainer, "windows_aarch64", "windows", "aarch64");
Expand All @@ -269,7 +269,7 @@ void createToolChains(NativeToolChainRegistry toolChainRegistry) {
// The core Gradle toolchain for gcc only targets x86 and x86_64 out of the box.
// https://github.com/gradle/gradle/blob/36614ee523e5906ddfa1fed9a5dc00a5addac1b0/subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
toolChain.target("linux_aarch64");
toolChain.target("linux_riscv64");
// toolChain.target("linux_riscv64"); // needs https://github.com/gradle/native-platform/issues/387
});
}
if (toolChainRegistry.stream().noneMatch(toolChain -> toolChain.getName().equals("clang"))) {
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/src/main/java/gradlebuild/NcursesPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public class NcursesPlugin extends RuleSource {
addPlatform(platformContainer, "linux_amd64_ncurses6", "linux", "amd64");
addPlatform(platformContainer, "linux_aarch64_ncurses5", "linux", "aarch64");
addPlatform(platformContainer, "linux_aarch64_ncurses6", "linux", "aarch64");
addPlatform(platformContainer, "linux_riscv64_ncurses5", "linux", "riscv64");
addPlatform(platformContainer, "linux_riscv64_ncurses6", "linux", "riscv64");
// addPlatform(platformContainer, "linux_riscv64_ncurses5", "linux", "riscv64"); // needs https://github.com/gradle/native-platform/issues/387
// addPlatform(platformContainer, "linux_riscv64_ncurses6", "linux", "riscv64"); // needs https://github.com/gradle/native-platform/issues/387
}

@Mutate void configureBinaries(@Each NativeBinarySpecInternal binarySpec, Collection<NcursesVersion> ncursesVersions) {
Expand Down Expand Up @@ -82,8 +82,8 @@ private boolean isNcursesVersion(NativePlatform targetPlatform, NcursesVersion n
// https://github.com/gradle/gradle/blob/36614ee523e5906ddfa1fed9a5dc00a5addac1b0/subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
toolChain.target("linux_aarch64_ncurses5");
toolChain.target("linux_aarch64_ncurses6");
toolChain.target("linux_riscv64_ncurses5");
toolChain.target("linux_riscv64_ncurses6");
// toolChain.target("linux_riscv64_ncurses5"); // needs https://github.com/gradle/native-platform/issues/387
// toolChain.target("linux_riscv64_ncurses6"); // needs https://github.com/gradle/native-platform/issues/387
});
}

Expand Down
934 changes: 283 additions & 651 deletions gradle/verification-keyring.keys

Large diffs are not rendered by default.

82 changes: 18 additions & 64 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
<configuration>
<verify-metadata>false</verify-metadata>
<verify-signatures>true</verify-signatures>
<keyring-format>armored</keyring-format>
<key-servers enabled="false"/>
<trusted-artifacts>
<trust group="net.rubygrapefruit"/>
<trust group="org.junit.jupiter"/>
<trust group="org.junit.platform"/>
<trust file=".*-javadoc[.]jar" regex="true"/>
<trust file=".*-sources[.]jar" regex="true"/>
<trust file=".*-src[.]zip" regex="true"/>
Expand All @@ -18,74 +17,29 @@
<trusting group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
</trusted-key>
<trusted-key id="0A123C1ED3F13A6A0140E166C71FB765CD9DE313" group="org.apache.ant"/>
<trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
<trusted-key id="253E8E4C6FB28D11748115C1249DEE8E2C07A0A2" group="com.github.javaparser"/>
<trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
<trusting group="commons-beanutils"/>
<trusting group="commons-codec"/>
<trusting group="commons-io"/>
<trusting group="org.apache.commons"/>
<trusting group="xml-apis"/>
</trusted-key>
<trusted-key id="31FAE244A81D64507B47182E1B2718089CE964B8" group="com.thoughtworks.qdox"/>
<trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B">
<trusting group="org.apache.groovy"/>
<trusting group="org.apache.groovy" name="groovy"/>
<trusting group="org.codehaus.groovy"/>
<trusting group="org.codehaus.groovy" name="groovy"/>
</trusted-key>
<trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325">
<trusting group="ch.qos.logback"/>
<trusting group="org.slf4j"/>
<trusting group="org.slf4j" name="slf4j-api"/>
</trusted-key>
<trusted-key id="4DB1A49729B053CAF015CEE9A6ADFC93EF34893E" group="org.hamcrest"/>
<trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple"/>
<trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="^com[.]google($|([.].*))" regex="true"/>
<trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
<trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="io.github.gradle" name="gradle-org-conventions-plugin"/>
<trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB" group="commons-codec" name="commons-codec"/>
<trusted-key id="31FAE244A81D64507B47182E1B2718089CE964B8" group="com.thoughtworks.qdox" name="qdox"/>
<trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B" group="org.apache.groovy"/>
<trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j" name="slf4j-api"/>
<trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple" name="jopt-simple"/>
<trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="com.google.guava" name="failureaccess"/>
<trusted-key id="6DE9B8077FBB2F8A019F4904BD17A565509DEE20" group="com.github.javaparser" name="javaparser-core"/>
<trusted-key id="7615AD56144DF2376F49D98B1669C4BB543E0445" group="com.google.errorprone"/>
<trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
<trusted-key id="76E94E8FF0AB5AF3B6F8366972FEFD1572EB75E1" group="org.spockframework"/>
<trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671">
<trusting group="com.gradle"/>
<trusting group="org.gradle"/>
</trusted-key>
<trusted-key id="7FAA0F2206DE228F0DB01AD741321490758AAD6F" group="org.codehaus.groovy"/>
<trusted-key id="AAEC735F7444A9FC055E206598DE3D829C24E9C7A8EEA6EFDEEB1962087FE811" group="org.junit.platform"/>
<trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc" name="j2objc-annotations"/>
<trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE">
<trusting group="com.google.guava"/>
<trusting group="^com[.]google($|([.].*))" regex="true"/>
</trusted-key>
<trusted-key id="CE8075A251547BEE249BC151A2115AE15F6B8B72" group="org.apache.ant"/>
<trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
<trusted-key id="FC2C31FC25FEDE4E7AD0D18C2BFD7825A8984FBE" group="com.github.javaparser" name="javaparser-core"/>
<trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs" name="jsr305"/>
<trusted-key id="76E94E8FF0AB5AF3B6F8366972FEFD1572EB75E1" group="org.spockframework" name="spock-core"/>
<trusted-key id="7B79ADD11F8A779FE90FD3D0893A028475557671" group="com.gradle"/>
<trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE" group="com.google.guava"/>
<trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest" name="hamcrest"/>
<trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc" name="j2objc-annotations"/>
<trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="com.google.errorprone" name="error_prone_annotations"/>
<trusted-key id="FF6E2C001948C5F2F38B0CC385911F425EC61B51">
<trusting group="junit"/>
<trusting group="org.apiguardian"/>
<trusting group="org.junit.jupiter"/>
<trusting group="org.junit.platform"/>
<trusting group="org.junit.vintage"/>
<trusting group="org.junit"/>
<trusting group="org.opentest4j"/>
<trusting group="^org[.]junit($|([.].*))" regex="true"/>
</trusted-key>
</trusted-keys>
</configuration>
<components>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.18.0">
<artifact name="error_prone_annotations-2.18.0.jar">
<pgp value="EE0CA873074092F806F59B65D364ABAA39A47320"/>
</artifact>
</component>
<component group="com.google.j2objc" name="j2objc-annotations" version="2.8">
<artifact name="j2objc-annotations-2.8.jar">
<pgp value="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446"/>
</artifact>
</component>
<component group="io.github.gradle" name="develocity-conventions-plugin" version="0.12.1">
<artifact name="develocity-conventions-plugin-0.12.1.jar">
<sha256 value="f9c53f4dad78c9041b36324402260a8f13264140f96c02ffbb4bafc4157be95f" origin="Verified" reason="Artifact is not signed"/>
</artifact>
</component>
</components>
<components/>
</verification-metadata>
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.gradle.develocity").version("4.3.1")
id("io.github.gradle.develocity-conventions-plugin").version("0.12.1")
id("com.gradle.develocity").version("4.3.2")
id("io.github.gradle.develocity-conventions-plugin").version("0.14.1")
}

rootProject.name = "native-platform"
Expand Down
Loading