Merge pull request #3955 from tronprotocol/version/GreatVoyage-v4.2.2.1-265-ge1ce07fb5

lvs007 · web-flow · commit 8dbd75d894a4 · 2021-08-02T14:02:11.000+08:00
Version/great voyage v4.2.2.1 265 ge1ce07fb5
diff --git a/framework/src/main/java/org/tron/program/Version.java b/framework/src/main/java/org/tron/program/Version.java
@@ -2,11 +2,11 @@
 
 public class Version {
 
-  public static final String VERSION_NAME = "GreatVoyage-v4.2.2-3-g6d7831aab";
-  public static final String VERSION_CODE = "15589";
-  private static final String VERSION = "4.2.2.1";
+  public static final String VERSION_NAME = "GreatVoyage-v4.2.2.1-265-ge1ce07fb5";
+  public static final String VERSION_CODE = "15856";
+  private static final String VERSION = "4.3.0";
 
   public static String getVersion() {
     return VERSION;
   }
-}
+}
diff --git a/plugins/build.gradle b/plugins/build.gradle
@@ -23,9 +23,6 @@ configurations.getByName('checkstyleConfig') {
     transitive = false
 }
 
-task version(type: Exec) {
-    commandLine 'bash', '-c', '../ver.sh'
-}
 dependencies {
     //local libraries
     compile fileTree(dir: 'libs', include: '*.jar')

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,6 @@ configurations.getByName('checkstyleConfig') {`
`23`	`23`	`transitive = false`
`24`	`24`	`}`
`25`	`25`
`26`		`-task version(type: Exec) {`
`27`		`- commandLine 'bash', '-c', '../ver.sh'`
`28`		`-}`
`29`	`26`	`dependencies {`
`30`	`27`	`//local libraries`
`31`	`28`	`compile fileTree(dir: 'libs', include: '*.jar')`