Merge pull request tronprotocol#299 from tronprotocol/master

merge master to develop
Manny27nyc · Sep 3, 2020 · bcee98f · bcee98f
2 parents 8d294ad + 91e5ad2
commit bcee98f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dapp-chain/side-chain/framework/src/main/java/org/tron/program/Version.java b/dapp-chain/side-chain/framework/src/main/java/org/tron/program/Version.java
@@ -2,8 +2,8 @@
 
 public class Version {
 
-  public static final String versionName = "SunNetwork-v1.0.3-108-gc28f6931";
-  public static final String versionCode = "1418";
+  public static final String versionName = "SunNetwork-v1.5.0-7-ga9363a2a";
+  public static final String versionCode = "1427";
   private static final String version = "1.5.0";
 
   public static String getVersion() {

diff --git a/dapp-chain/side-chain/ver.sh b/dapp-chain/side-chain/ver.sh
@@ -24,7 +24,7 @@ then
 fi
 
 
-versionPath="src/main/java/org/tron/program/Version.java"
+versionPath="framework/src/main/java/org/tron/program/Version.java"
 sed -i -e "s/versionName.*$/versionName = \"$versionName\";/g;s/versionCode.*$/versionCode = \"$versionCode\";/g" $versionPath
 git add $versionPath
 git commit -m "update a new version. version name:$versionName,version code:$versionCode"