From 787056f29ac050ad76a1d3bfeeb8759557cbf769 Mon Sep 17 00:00:00 2001 From: Chris Barratt Date: Fri, 25 Nov 2022 14:09:01 +0000 Subject: [PATCH] Build changes to switch to HC00 --- build.gradle | 74 +------------------ buildSrc/gradle.properties | 5 +- .../java/com/r3/csde/CsdeRpcInterface.java | 2 +- gradle.properties | 14 ++-- 4 files changed, 12 insertions(+), 83 deletions(-) diff --git a/build.gradle b/build.gradle index d5715b5..f4962e6 100644 --- a/build.gradle +++ b/build.gradle @@ -45,36 +45,6 @@ cordapp { } } -/* -// Declare the set of Kotlin compiler options we need to build a CorDapp. -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - allWarningsAsErrors = false - - // Specify the version of Kotlin that we are that we will be developing. - languageVersion = '1.7' - // Specify the Kotlin libraries that code is compatible with - apiVersion = '1.7' - // Note that we Need to use a version of Kotlin that will be compatible with the Corda API. - // Currently that is developed in Kotlin 1.7 so picking the same version ensures compatibility with that. - - // Specify the version of Java to target. - jvmTarget = javaVersion - - // Needed for reflection to work correctly. - javaParameters = true - - // -Xjvm-default determines how Kotlin supports default methods. - // JetBrains currently recommends developers use -Xjvm-default=all - // https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.jvm/-jvm-default/ - freeCompilerArgs += [ - "-Xjvm-default=all" - ] - } -} - - */ - // Declare the set of Kotlin compiler options we need to build a CorDapp. tasks.withType(JavaCompile) { @@ -84,53 +54,11 @@ tasks.withType(JavaCompile) { ] } - - repositories { - mavenLocal() // All dependencies are held in Maven Central mavenCentral() - - // R3 Internal repositories - // Repository the provides kotlin-stdlib-jdk8-osgi created by R3. - // Final location to be decided. maven { - url = "$artifactoryContextUrl/corda-dependencies" - } - // Repository provides Corda 5 binaries that implement Corda-API. - // These will be made publicly available. - // Final location to be decided. - // Repository subject to change - maven { - url = "$artifactoryContextUrl/corda-os-maven" - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - // Provides the combined-worker Jars - // These will be made publicly available. - // Final location to be decided. - maven { - url = "$artifactoryContextUrl/corda-ent-maven-unstable-local" - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - maven { - url = "$artifactoryContextUrl/corda-ent-maven" - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - maven { - url = "$artifactoryContextUrl/engineering-tools-maven-unstable" - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } + url = "$artifactoryContextUrl/" } } diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index e892a48..3636833 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1,3 +1,6 @@ jacksonVersion = 2.13.3 unirestVersion=3.13.10 -cordaApiVersion=5.0.0.190-DevPreview-2 +cordaApiVersion=5.0.0.505-Beta1.0-HC00 + +# R3 internal repository +artifactoryContextUrl=https://staging.download.corda.net/maven/20ede3c6-29c0-11ed-966d-b7c36748b9f6-Beta1.0-HC00 diff --git a/buildSrc/src/main/java/com/r3/csde/CsdeRpcInterface.java b/buildSrc/src/main/java/com/r3/csde/CsdeRpcInterface.java index eef8c7e..93f89e7 100644 --- a/buildSrc/src/main/java/com/r3/csde/CsdeRpcInterface.java +++ b/buildSrc/src/main/java/com/r3/csde/CsdeRpcInterface.java @@ -165,7 +165,7 @@ public class CsdeRpcInterface { public void uploadCertificate(String certAlias, String certFName) { Unirest.config().verifySsl(false); - kong.unirest.HttpResponse uploadResponse = Unirest.put(baseURL + "/api/v1/certificates/codesigner/") + kong.unirest.HttpResponse uploadResponse = Unirest.put(baseURL + "/api/v1/certificates/cluster/code-signer") .field("alias", certAlias) .field("certificate", new File(certFName)) .basicAuth(rpcUser, rpcPasswd) diff --git a/gradle.properties b/gradle.properties index 1581641..ec4e7fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ kotlin.code.style=official # Specify the version of the Corda-API to use. # This needs to match the version supported by the Corda Cluster the CorDapp will run on. # cordaApiVersion=5.0.0.190-DevPreview-2 -cordaApiVersion=5.0.0.414-beta+ +cordaApiVersion=5.0.0.505-Beta1.0-HC00 # Specify the version of the cordapp-cpb and cordapp-cpk plugins -cordaPluginsVersion=7.0.0-DevPreview-2 +cordaPluginsVersion=7.0.0 # For the time being this just needs to be set to a dummy value. platformVersion = 999 # Version of Kotlin to use. # We recommend using a version close to that used by Corda-API. -kotlinVersion = 1.7.10 +kotlinVersion = 1.7.21 # Do not use default dependencies. kotlin.stdlib.default.dependency=false @@ -25,9 +25,8 @@ mockitoVersion=4.6.1 hamcrestVersion=2.2 # Settings For Development Utilities -testUtilsVersion=5.0.0.0-DevPreview-2 -#combinedWorkerVersion=5.0.0.0-DevPreview-2 -combinedWorkerVersion=5.0.0.0-beta+ +combinedWorkerVersion=5.0.0.0-Beta1.0-HC00 +simulatorVersion=5.0.0.0-Beta1.0-HC00 cordaClusterURL=https://localhost:8888 cordaRpcUser=admin @@ -36,5 +35,4 @@ devEnvWorkspace=workspace dbContainerName=CSDEpostgresql # R3 internal repository -artifactoryContextUrl=https://software.r3.com/artifactory -simulatorVersion=5.0.0.0-SNAPSHOT \ No newline at end of file +artifactoryContextUrl=https://staging.download.corda.net/maven/20ede3c6-29c0-11ed-966d-b7c36748b9f6-Beta1.0-HC00 \ No newline at end of file