Merge branch 'main' into release

onix-labs · Apr 15, 2022 · bb06c65 · bb06c65
2 parents 0c521dc + 69307c6
commit bb06c65
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,15 +5,15 @@ buildscript {
 
         corda_artifactory_url = 'https://software.r3.com/artifactory'
         corda_group = 'net.corda'
-        corda_release_version = '4.8'
+        corda_release_version = '4.9'
 
         corda_gradle_plugin_group = 'net.corda.plugins'
         corda_gradle_plugin_version = '5.0.4'
 
         junit_group = 'org.junit.jupiter'
         junit_version = '5.3.1'
 
-        cordapp_platform_version = 10
+        cordapp_platform_version = 11
         cordapp_contract_name = 'ONIXLabs Corda Core Contract'
         cordapp_workflow_name = 'ONIXLabs Corda Core Workflow'
         cordapp_vendor_name = 'ONIXLabs'

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 name=onixlabs-corda-core
 group=io.onixlabs
-version=4.0.0
+version=4.0.1
 onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
 onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3
diff --git a/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Customer.kt b/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Customer.kt
@@ -72,7 +72,7 @@ data class Customer(
         override val criteria: QueryCriteria = vaultQuery<Reward> {
             expression(RewardEntity::owner equalTo customer.owner)
             expression(RewardEntity::customerLinearId equalTo customer.linearId.id)
-            expression(RewardEntity::customerExternalId equalTo  customer.linearId.externalId)
+            expression(RewardEntity::customerExternalId equalTo customer.linearId.externalId)
         }
 
         override fun isPointingTo(stateAndRef: StateAndRef<Reward>): Boolean = with(stateAndRef.state) {

diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/ContractTest.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/ContractTest.kt
@@ -55,7 +55,7 @@ abstract class ContractTest {
     @BeforeEach
     private fun setup() {
         val networkParameters = testNetworkParameters(
-            minimumPlatformVersion = 10,
+            minimumPlatformVersion = 11,
             notaries = listOf(NotaryInfo(NOTARY.party, true))
         )
         _services = MockServices(cordapps, IDENTITY_A, networkParameters, IDENTITY_B, IDENTITY_C)

diff --git a/onixlabs-corda-test-workflow/src/test/kotlin/io/onixlabs/corda/test/workflow/FlowTest.kt b/onixlabs-corda-test-workflow/src/test/kotlin/io/onixlabs/corda/test/workflow/FlowTest.kt
@@ -94,7 +94,7 @@ abstract class FlowTest {
                     "io.onixlabs.corda.test.workflow"
                 ),
                 networkParameters = testNetworkParameters(
-                    minimumPlatformVersion = 10
+                    minimumPlatformVersion = 11
                 )
             )
         )