Fix issues with conversion module.

TheNewEconomy · Sep 17, 2021 · e26d7bc · e26d7bc
1 parent 0c6af98
commit e26d7bc
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 35 deletions.
diff --git a/TNE/dependency-reduced-pom.xml b/TNE/dependency-reduced-pom.xml
@@ -39,8 +39,8 @@
  <artifactId>maven-compiler-plugin</artifactId>
  <version>3.8.1</version>
  <configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>1.16</source>
+ <target>1.16</target>
  </configuration>
  </plugin>
  <plugin>
@@ -282,8 +282,8 @@
  </snapshotRepository>
  </distributionManagement>
  <properties>
+ <maven.compiler.target>1.16</maven.compiler.target>
+ <maven.compiler.source>1.16</maven.compiler.source>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
  </properties>
 </project>
diff --git a/TNE/pom.xml b/TNE/pom.xml
@@ -6,8 +6,8 @@
  <packaging>jar</packaging>
  <name>The New Economy</name>
  <properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.16</maven.compiler.source>
+ <maven.compiler.target>1.16</maven.compiler.target>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  </properties>
 
@@ -28,8 +28,8 @@
  <artifactId>maven-compiler-plugin</artifactId>
  <version>3.8.1</version>
  <configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>1.16</source>
+ <target>1.16</target>
  </configuration>
  </plugin>
  <plugin>

diff --git a/TNEConversion/pom.xml b/TNEConversion/pom.xml
@@ -6,8 +6,8 @@
  <packaging>jar</packaging>
  <name>Conversion</name>
  <properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.16</maven.compiler.source>
+ <maven.compiler.target>1.16</maven.compiler.target>
  </properties>
  <build>
  <directory>target</directory>
@@ -30,11 +30,25 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
  <configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>1.16</source>
+ <target>1.16</target>
  </configuration>
  </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
  </plugins>
  </build>
 
@@ -73,9 +87,8 @@
  <dependency>
  <groupId>org.javalite</groupId>
  <artifactId>activejdbc</artifactId>
- <version>2.2</version>
- <type>jar</type>
- <scope>provided</scope>
+ <version>3.0-j11</version>
+ <scope>compile</scope>
  </dependency>
  </dependencies>
 </project>
diff --git a/TNEConversion/target/Conversion-0.0.1.4.jar b/TNEConversion/target/Conversion-0.0.1.4.jar
diff --git a/...ersion/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/...ersion/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -33,6 +33,7 @@ net\tnemc\conversion\InvalidDatabaseImport.class
 net\tnemc\conversion\impl\iConomy.class
 net\tnemc\conversion\impl\AdvancedEconomy.class
 net\tnemc\conversion\impl\SimpleConomy.class
+net\tnemc\conversion\command\ConverterCompleter.class
 net\tnemc\conversion\impl\Meep.class
 net\tnemc\conversion\impl\EcoSystem.class
 net\tnemc\conversion\impl\SaneEconomy$1.class

diff --git a/...nversion/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/...nversion/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,44 +1,49 @@
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\SaneEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\menu\ConvertIcon.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\CraftConomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\EasyCoins.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\Converter.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\BConomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\Essentials.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MySQLBridge.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\ConversionModule.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\FeatherEconomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\SwiftEconomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\command\ConvertCommand.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\BOSEconomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\GemsEconomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\SimpleConomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\AConomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\iConomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\TownyEco.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\XConomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\BEconomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MinetopiaEconomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\SQLConomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\BasicEconomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\DevCoinSystem.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\InvalidDatabaseImport.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\FeConomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\Meep.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MineConomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\Blings.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\iConomy7.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\menu\ConversionMenu.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MoConomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MineCoinsYML.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\TokensEconomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\ECEconomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\UltimateEconomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\GMoney.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\Meller.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\AdvancedEconomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\CMI.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\SimplisticEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MineCoin.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\SaneEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\EasyCoins.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\Converter.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\BConomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\Essentials.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\ConversionModule.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\command\ConvertCommand.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\BOSEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\GemsEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\XConomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\BEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MinetopiaEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\command\ConverterCompleter.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\SQLConomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\BasicEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\ConverterManager.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\FeConomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MineConomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\JoinListener.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\TokensEconomy.java
+S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\ECEconomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\EcoPlugin.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\EcoSystem.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\RealEconomy.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\SimplisticEconomy.java
 S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\EconomyAPI.java
-S:\Github\The New Economy\TNE\TNEConversion\src\net\tnemc\conversion\impl\MineCoin.java