Merge pull request #8 from OpenEdgn/dev

优化项目结构.

Author: ExplodingDragon

build.gradle.kts

@@ -1,12 +1,24 @@
-group = "com.github.openEDGN"
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+group = "com.github.OpenEdgn"
 version = "last"
 plugins {
     kotlin("jvm") version "1.4.10"
     `maven-publish`
 }
 
+java {
+    modularity.inferModulePath.set(true)
+}
+
+
 java.sourceCompatibility = JavaVersion.VERSION_11
 
+val compileKotlin: KotlinCompile by tasks
+val compileJava: JavaCompile by tasks
+compileJava.destinationDir = compileKotlin.destinationDir
+
+
 dependencies {
     implementation(kotlin("reflect"))
     implementation(kotlin("stdlib"))

src/main/java/module-info.java

@@ -0,0 +1,7 @@
+module open_edgn.dataformat4k {
+    requires kotlin.stdlib;
+    requires kotlin.reflect;
+    requires jdk.unsupported;
+    exports com.github.open_edgn.data.format;
+    opens com.github.open_edgn.data.format;
+}

src/main/kotlin/com/github/open_edgn/data/format/Annotations.kt

@@ -11,6 +11,7 @@ package com.github.open_edgn.data.format
  * @property alias Array<out String>
  * @constructor
  */
+@Deprecated("将在后期版本移除")
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 annotation class ArgsItem(
@@ -22,10 +23,11 @@ annotation class ArgsItem(
 /**
  * 忽略字段，打上此字段后将忽略对此字段的一切事情
  */
+@Deprecated("将在后期版本移除")
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.FUNCTION,
         AnnotationTarget.CLASS,
         AnnotationTarget.FILE,
         AnnotationTarget.PROPERTY,
         AnnotationTarget.FIELD)
-annotation class Ignore()
+annotation class Ignore

src/main/kotlin/com/github/open_edgn/data/format/Args2Reader.kt

@@ -13,6 +13,7 @@ import kotlin.reflect.jvm.jvmErasure
  * @param allowJVMArgs 添加 JVM 参数
  * @param args 程序传参
  */
+@Deprecated("实用性不大，将在后期版本移除")
 class Args2Reader(args: Array<String>, allowJVMArgs: Boolean = false) : BaseArgsLoader() {
     private val data = HashMap<String, String>()
 

src/main/kotlin/com/github/open_edgn/data/format/StringFormatUtils.kt

@@ -36,7 +36,7 @@ object StringFormatUtils {
      *
      * @param formatArr Array<out IObjectFormat<*>> 解析方案
      */
-    fun include(vararg formatArr: IObjectFormat<*>) {
+    internal fun include(vararg formatArr: IObjectFormat<*>) {
         for (format in formatArr) {
             for (clazz in format.register) {
                 formatMap[clazz] = format