Skip to content

Commit

Permalink
Merge pull request tronprotocol#3625 from tronprotocol/version/GreatV…
Browse files Browse the repository at this point in the history
…oyage-v4.1.1-2046-gc465c9ee4

Version/great voyage v4.1.1 2046 gc465c9ee4
  • Loading branch information
eodiandie authored Jan 19, 2021
2 parents c465c9e + ebc445e commit 2ba7c48
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions framework/src/main/java/org/tron/program/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

public class Version {

public static final String VERSION_NAME = "GreatVoyage-v4.1.0-1-g635526cc6";
public static final String VERSION_CODE = "13215";
public static final String VERSION_NAME = "GreatVoyage-v4.1.1-2046-gc465c9ee4";
public static final String VERSION_CODE = "15262";
private static final String VERSION = "4.1.1";

public static String getVersion() {
Expand Down
2 changes: 1 addition & 1 deletion ver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fi


versionPath="src/main/java/org/tron/program/Version.java"
sed -i -e "s/versionName.*$/versionName = \"$versionName\";/g;s/versionCode.*$/versionCode = \"$versionCode\";/g" $versionPath
sed -i -e "s/VERSION_NAME.*$/VERSION_NAME = \"$versionName\";/g;s/VERSION_CODE.*$/VERSION_CODE = \"$versionCode\";/g" $versionPath
git add $versionPath
git commit -m "update a new version. version name:$versionName,version code:$versionCode"
git push origin $versionBranch

0 comments on commit 2ba7c48

Please sign in to comment.