Skip to content

Commit

Permalink
adapt changes
Browse files Browse the repository at this point in the history
Signed-off-by: Xin Li <[email protected]>
  • Loading branch information
xin-hedera committed Jan 3, 2025
1 parent 5075cf7 commit bed8905
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions hedera-mirror-web3/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2024 Hedera Hashgraph, LLC
* Copyright (C) 2022-2025 Hedera Hashgraph, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,7 +17,6 @@
import java.net.HttpURLConnection
import java.net.URI
import org.web3j.solidity.gradle.plugin.SolidityCompile
import org.web3j.solidity.gradle.plugin.SolidityResolve

description = "Hedera Mirror Node Web3"

Expand Down Expand Up @@ -139,17 +138,6 @@ tasks.processTestResources {
dependsOn(tasks.named("moveAndCleanTestHistoricalFiles"))
}

tasks.register("resolveSolidityHistorical", SolidityResolve::class) {
group = "historical"
description = "Resolves the historical solidity version $historicalSolidityVersion"
sources = fileTree("src/testHistorical/solidity")
allowPaths = setOf("src/testHistorical/solidity")

val packageJsonFile = "./build/node_modules/@openzeppelin/contracts/package.json"
packageJson = file(packageJsonFile)
dependsOn("extractContracts")
}

afterEvaluate {
tasks.named("compileTestHistoricalSolidity", SolidityCompile::class.java).configure {
group = "historical"
Expand All @@ -158,15 +146,13 @@ afterEvaluate {
version = historicalSolidityVersion
source = fileTree("src/testHistorical/solidity") { include("*.sol") }
dependsOn("extractContracts")
dependsOn("resolveSolidityHistorical")
}
}

afterEvaluate {
tasks.named("generateTestHistoricalContractWrappers") {
dependsOn(tasks.named("generateTestContractWrappers"))
dependsOn(extractOpenZeppelin)
dependsOn(tasks.named("resolveSolidityHistorical"))
}
}

Expand Down Expand Up @@ -212,7 +198,7 @@ tasks.register<Copy>("moveAndCleanTestHistoricalFiles") {
dependsOn(tasks.named("generateTestHistoricalContractWrappers"))
}

afterEvaluate { tasks.named("resolveSolidity") { dependsOn("extractContracts") } }
afterEvaluate { tasks.named("extractSolidityImports") { dependsOn("extractContracts") } }

tasks.compileTestJava {
options.compilerArgs.add("--enable-preview")
Expand Down

0 comments on commit bed8905

Please sign in to comment.