fix: make review changes

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "lib/solmate"]
-	path = lib/solmate
-	url = https://github.com/transmissions11/solmate
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

build.gradle

@@ -40,27 +40,21 @@ tasks.withType(Test) {
 }
 
 node {
-    version = '18.20.5'
+    version = '20.18.1'
     download = true
 }
 
-//task compileSolidity(type: NpxTask) {
-//    dependsOn('npmInstall')
-//    command = 'hardhat'
-//    args = ['compile']
-//}
 task compileSolidity(type : Exec) {
     dependsOn('npmInstall')
     commandLine 'forge', 'compile'
 }
-compileJava.finalizedBy('compileSolidity')
 
-task testSolidity(type : Exec) {
+task testSolidity(type: Exec) {
     dependsOn('compileSolidity')
     commandLine 'forge', 'test'
 }
 test.dependsOn('testSolidity')
 
 neow3jCompile {
     className = "com.axlabs.neo.grantshares.GrantSharesTreasury"
-}
+}

foundry.toml

@@ -4,4 +4,4 @@ test = 'src/test/solidity'
 out = 'artifacts'
 libs = ['lib']
 
-# See more config options https://github.com/foundry-rs/foundry/tree/master/config
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config

hardhat.config.ts

@@ -1,5 +1,4 @@
 import fs from "fs";
-import "@nomiclabs/hardhat-waffle";
 import "@typechain/hardhat";
 import "hardhat-preprocessor";
 import { HardhatUserConfig, task } from "hardhat/config";
@@ -18,7 +17,7 @@ task("example", "Example task").setAction(example);
 
 const config: HardhatUserConfig = {
   solidity: {
-    version: "0.8.13",
+    version: "0.8.20",
     settings: {
       optimizer: {
         enabled: true,