Изменена структура модулей

Author: aNNiMON

proguard.properties

@@ -34,7 +34,7 @@
     native <methods>;
 }
 
--keep public class * implements com.annimon.ownlang.lib.modules.Module
+-keep public class * implements com.annimon.ownlang.modules.Module
 
 # Soft obfuscation
 -keep public class * {

src/main/java/com/annimon/ownlang/annotations/Modules.java

@@ -1,4 +1,4 @@
-package com.annimon.ownlang.lib.modules;
+package com.annimon.ownlang.modules;
 
 /**
  *

src/main/java/com/annimon/ownlang/lib/modules/package-info.java

@@ -1,6 +1,7 @@
-package com.annimon.ownlang.lib.modules;
+package com.annimon.ownlang.modules.canvas;
 
 import com.annimon.ownlang.lib.*;
+import com.annimon.ownlang.modules.Module;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;

…/annimon/ownlang/lib/modules/Module.java …/com/annimon/ownlang/modules/Module.javasrc/main/java/com/annimon/ownlang/lib/modules/Module.java renamed to src/main/java/com/annimon/ownlang/modules/Module.java src/main/java/com/annimon/ownlang/lib/modules/Module.java renamed to src/main/java/com/annimon/ownlang/modules/Module.java

@@ -1,7 +1,8 @@
-package com.annimon.ownlang.lib.modules;
+package com.annimon.ownlang.modules.canvasfx;
 
 import com.annimon.ownlang.exceptions.TypeException;
 import com.annimon.ownlang.lib.*;
+import com.annimon.ownlang.modules.Module;
 import static com.annimon.ownlang.lib.Converters.*;
 import java.awt.Dimension;
 import java.lang.reflect.Modifier;

…/annimon/ownlang/lib/modules/canvas.java …nimon/ownlang/modules/canvas/canvas.javasrc/main/java/com/annimon/ownlang/lib/modules/canvas.java renamed to src/main/java/com/annimon/ownlang/modules/canvas/canvas.java src/main/java/com/annimon/ownlang/lib/modules/canvas.java renamed to src/main/java/com/annimon/ownlang/modules/canvas/canvas.java

@@ -1,7 +1,8 @@
-package com.annimon.ownlang.lib.modules;
+package com.annimon.ownlang.modules.date;
 
 import com.annimon.ownlang.exceptions.TypeException;
 import com.annimon.ownlang.lib.*;
+import com.annimon.ownlang.modules.Module;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

…nnimon/ownlang/lib/modules/canvasfx.java …n/ownlang/modules/canvasfx/canvasfx.javasrc/main/java/com/annimon/ownlang/lib/modules/canvasfx.java renamed to src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java src/main/java/com/annimon/ownlang/lib/modules/canvasfx.java renamed to src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java

@@ -1,7 +1,8 @@
-package com.annimon.ownlang.lib.modules;
+package com.annimon.ownlang.modules.files;
 
 import com.annimon.ownlang.exceptions.ArgumentsMismatchException;
 import com.annimon.ownlang.lib.*;
+import com.annimon.ownlang.modules.Module;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;

…om/annimon/ownlang/lib/modules/date.java …m/annimon/ownlang/modules/date/date.javasrc/main/java/com/annimon/ownlang/lib/modules/date.java renamed to src/main/java/com/annimon/ownlang/modules/date/date.java src/main/java/com/annimon/ownlang/lib/modules/date.java renamed to src/main/java/com/annimon/ownlang/modules/date/date.java

@@ -1,4 +1,4 @@
-package com.annimon.ownlang.lib.modules.functions.forms;
+package com.annimon.ownlang.modules.forms;
 
 import com.annimon.ownlang.exceptions.TypeException;
 import com.annimon.ownlang.lib.Arguments;

…m/annimon/ownlang/lib/modules/files.java …annimon/ownlang/modules/files/files.javasrc/main/java/com/annimon/ownlang/lib/modules/files.java renamed to src/main/java/com/annimon/ownlang/modules/files/files.java src/main/java/com/annimon/ownlang/lib/modules/files.java renamed to src/main/java/com/annimon/ownlang/modules/files/files.java

@@ -1,4 +1,4 @@
-package com.annimon.ownlang.lib.modules.functions.forms;
+package com.annimon.ownlang.modules.forms;
 
 import com.annimon.ownlang.lib.Arguments;
 import com.annimon.ownlang.lib.Value;