Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
MrMatthewLayton committed Apr 15, 2022
2 parents fee93b3 + f33ad60 commit eff186b
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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'
Expand All @@ -14,9 +14,9 @@ buildscript {
junit_version = '5.3.1'

onixlabs_group = 'io.onixlabs'
onixlabs_corda_core_release_version = '4.0.0'
onixlabs_corda_core_release_version = '4.0.1'

cordapp_platform_version = 10
cordapp_platform_version = 11
cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'
cordapp_workflow_name = 'ONIXLabs Corda Identity Framework Workflow'
cordapp_vendor_name = 'ONIXLabs'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=onixlabs-corda-identity-framework
group=io.onixlabs
version=4.0.0
version=4.0.1
onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ abstract class IntegrationTest : AutoCloseable {
waitForAllNodesToFinish = false,
inMemoryDB = true,
premigrateH2Database = true,
networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
networkParameters = testNetworkParameters(minimumPlatformVersion = 11),
cordappsForAllNodes = cordappsForPackages(
"io.onixlabs.corda.core.workflow",
"io.onixlabs.corda.identityframework.contract",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ abstract class FlowTest {
private fun setup() {
_network = MockNetwork(
MockNetworkParameters(
networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
networkParameters = testNetworkParameters(minimumPlatformVersion = 11),
cordappsForAllNodes = cordappsForPackages(
"io.onixlabs.corda.core.workflow",
"io.onixlabs.corda.identityframework.contract",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ abstract class FlowTest {
private fun setup() {
_network = MockNetwork(
MockNetworkParameters(
networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
networkParameters = testNetworkParameters(minimumPlatformVersion = 11),
cordappsForAllNodes = cordappsForPackages(
"io.onixlabs.corda.core.workflow",
"io.onixlabs.corda.identityframework.contract",
Expand Down

0 comments on commit eff186b

Please sign in to comment.