Upstream/SaneEconomy
1
0
Fork 0
mirror of https://github.com/AppleDash/SaneEconomy.git synced 2024-09-28 06:27:27 +02:00
Code Issues Projects Releases Wiki Activity

0.12.7 - Fix version comparator AGAIN

Browse Source
This commit is contained in:
AppleDash 2017-07-15 23:49:05 -04:00
parent 31d311c229
commit 9a00cddf24
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SaneEconomyCore/pom.xml
View File

@ -9,7 +9,7 @@
<version>0</version> <version>0</version>
</parent> </parent>
<artifactId>SaneEconomyCore</artifactId> <artifactId>SaneEconomyCore</artifactId>
<version>0.12.6-SNAPSHOT</version> <version>0.12.7-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

14
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/updates/VersionComparer.java
View File

@ -17,15 +17,7 @@ public class VersionComparer {
int[] firstParts = intifyParts(first); int[] firstParts = intifyParts(first);
int[] secondParts = intifyParts(second); int[] secondParts = intifyParts(second);
if (secondParts[0] > firstParts[0]) { return computeInt(secondParts) > computeInt(firstParts);
return true;
}
if (secondParts[1] > firstParts[1]) {
return true;
}
return secondParts[2] > firstParts[2];
} }
private static int[] intifyParts(String version) { private static int[] intifyParts(String version) {
@ -33,4 +25,8 @@ public class VersionComparer {
return new int[] { Integer.valueOf(firstParts[0]), Integer.valueOf(firstParts[1]), Integer.valueOf(firstParts[2]) }; return new int[] { Integer.valueOf(firstParts[0]), Integer.valueOf(firstParts[1]), Integer.valueOf(firstParts[2]) };
} }
private static int computeInt(int[] parts) {
return (parts[0] * 1000000) + (parts[1] * 1000) + parts[2];
}
} }

2
SaneEconomyCore/src/main/resources/plugin.yml
View File

@ -1,7 +1,7 @@
name: SaneEconomy name: SaneEconomy
author: AppleDash author: AppleDash
main: org.appledash.saneeconomy.SaneEconomy main: org.appledash.saneeconomy.SaneEconomy
version: 0.12.6 version: 0.12.7
load: STARTUP load: STARTUP
softdepend: [Vault] softdepend: [Vault]
commands: commands:

1
SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/VersionComparerTest.java
View File

@ -15,5 +15,6 @@ public class VersionComparerTest {
Assert.assertFalse(VersionComparer.isSemVerGreaterThan("2.0.0", "1.0.0")); Assert.assertFalse(VersionComparer.isSemVerGreaterThan("2.0.0", "1.0.0"));
Assert.assertTrue(VersionComparer.isSemVerGreaterThan("0.1.0", "0.2.0")); Assert.assertTrue(VersionComparer.isSemVerGreaterThan("0.1.0", "0.2.0"));
Assert.assertTrue(VersionComparer.isSemVerGreaterThan("1.0.0", "2.0.0")); Assert.assertTrue(VersionComparer.isSemVerGreaterThan("1.0.0", "2.0.0"));
Assert.assertFalse(VersionComparer.isSemVerGreaterThan("0.12.6", "0.5.7"));
} }
} }

2
SaneEconomyMobKills/pom.xml
View File

@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>org.appledash</groupId> <groupId>org.appledash</groupId>
<artifactId>SaneEconomyCore</artifactId> <artifactId>SaneEconomyCore</artifactId>
<version>0.12.6-SNAPSHOT</version> <version>0.12.7-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
SaneEconomyOnlineTime/pom.xml
View File

@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>org.appledash</groupId> <groupId>org.appledash</groupId>
<artifactId>SaneEconomyCore</artifactId> <artifactId>SaneEconomyCore</artifactId>
<version>0.12.6-SNAPSHOT</version> <version>0.12.7-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
SaneEconomySignShop/pom.xml
View File

@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>org.appledash</groupId> <groupId>org.appledash</groupId>
<artifactId>SaneEconomyCore</artifactId> <artifactId>SaneEconomyCore</artifactId>
<version>0.12.6-SNAPSHOT</version> <version>0.12.7-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>