From 5b7811b85b6227f1a26840583906f7bbe9cf5cdd Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Tue, 27 Sep 2022 16:41:09 +0800 Subject: [PATCH] update build dependencies update cp version --- backend/build.gradle | 14 +++++++++----- backend/grepcp.list | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 7ec0c61..fe023a9 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -4,8 +4,8 @@ buildscript { mavenLocal() } dependencies { - classpath "org.bdware.bdcontract:simple-ypk-packer:0.5.0" - classpath "org.bdware.bdcontract:ypk-deploy-tool:0.5.2" + classpath "org.bdware.bdcontract:simple-ypk-packer:0.5.3" + classpath "org.bdware.bdcontract:ypk-deploy-tool:0.7.0" } } plugins { @@ -40,7 +40,7 @@ sourceSets { dependencies { api 'org.apache.logging.log4j:log4j-core:2.17.2' api 'org.apache.logging.log4j:log4j-api:2.17.2' - implementation 'org.bdware.sc:cp:1.5.7' + implementation 'org.bdware.sc:cp:1.6.4' testImplementation 'junit:junit:4.13.2' } @@ -73,12 +73,16 @@ task copyJar(type: Copy, dependsOn: [":backend:jar", ":backend:copyLibs"]) { } def reltivePath = "./backend" //reltivePath="." -def currVersion = "1.3.0" +def currVersion = "1.3.1" task grepCP(dependsOn: ["copyJar"]) { doLast { - org.bdware.datanet.YPKPacker.grepJarByCPVersion("${reltivePath}/build/output/libs", org.bdware.datanet.CPVersion.cp_1_5_3) + org.bdware.datanet.YPKPacker.grepJarByCPVersion("${reltivePath}/build/output/libs", org.bdware.datanet.CPVersion.cp_1_6_1) + org.bdware.datanet.YPKPacker.grepJarByListFile("${reltivePath}/build/output/libs", "${reltivePath}/grepcp.list") + } } +tasks.processResources.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE) +tasks.processTestResources.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE) task buildZip(type: Zip, dependsOn: ["copyAssets", "copyJar", "copyYJS", "grepCP"]) { from './build/output/' diff --git a/backend/grepcp.list b/backend/grepcp.list index 2a31198..1498756 100644 --- a/backend/grepcp.list +++ b/backend/grepcp.list @@ -1,3 +1,3 @@ -log4j-core-2.14.1.jar -log4j-api-2.14.1.jar -yjs.jar \ No newline at end of file +common-1.5.9.jar +cp-1.6.4.jar +rocksdbjni-7.3.1.jar \ No newline at end of file