20210322

Author: ExplodingDragon

.gitignore

@@ -1,15 +1,119 @@
-*.iml
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Gradle template
 .gradle
-.idea
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-*.tmp
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+
+
+!.gitkeep

README.md

@@ -2,33 +2,45 @@
 
 > 一套简单的 Kotlin DSL Gradle 项目
 
+## 特性
+
+- 跟随`Gradle` 和 `Kotlin` 最新稳定版本
+- 支持 `Java Module`
+- 针对中华人民共和国配置 `Maven` 加速镜像
+
 ## 快速开始
 
 1. 从 `https://github.com/OpenEdgn/GradleKotlinTemplate` 克隆项目
 2. 修改[LICENSE](./LICENSE) 为合适的分发协议
 3. 重建 [README.md](./README.md) 文件
 4. 修改 [settings.gradle.kts](./settings.gradle.kts) 中 `project.name` 为合适的名称
-5. 在项目根目录下执行 `./gradlew build -x test` 
+5. 在项目根目录下执行 `./gradlew build -x test`
 6. 在项目根目录下执行 `./gradlew test`
 7. 删除 [core](./core) 下的模板代码
 8. 修改 [module-info.java](./core/src/main/java/module-info.java) 中的配置
 
 ## 更新日志
 
-- **20201208** 
+- **20210322**
+    - 更新 `Kolin` 版本至 `1.4.31`
+    - 更新 `Gradle` 版本至 `6.8.3`
+    - 去除 `resources` 下孤立文件
+    - 将插件版本配置合并到 [gradle.properties](./gradle.properties) 下
+
+- **20201208**
     - 新增 Java 9 模块化支持
     - 修复在使用`maven-publish`打包时未对源码打包的问题
 
 - **20201125**
     - 更改项目名称为 `GradleKotlinTemplate`
     - 添加 `maven-publish` 插件，现在可以使用 `gradlew publishToMavenLocal` 了
-    - 修改 `Kotlin` 插件编译生成目录 [build.gradle.kts](./core/build.gradle.kts#L9) 
-    
+    - 修改 `Kotlin` 插件编译生成目录 [build.gradle.kts](./core/build.gradle.kts#L9)
+
 - **20201120**
     - 更新 `kotlin` 为 `1.4.10`
     - 更新 `gradle` 为 `6.5.1`
     - 删除过时的 `buildSrc` 方案
 
 ## LICENSE
 
-请看 [LICENSE](./LICENSE) 来了解此模板的 LICENSE
+请看 [LICENSE](./LICENSE) 来了解此模板的 LICENSE

build.gradle.kts

@@ -1,29 +1,36 @@
-group = "com.github.OpenEDGN.GradleKotlinTemplate"
+group = "com.github.OpenEDGN"
 // 你可以修改此为自己的组织地址
 version = "last"
 // 你可以指定此为项目 版本号
 
 buildscript {
-    repositories{
+    repositories {
         mavenLocal()
         maven { url = project.uri("https://maven.aliyun.com/repository/public/") }
-        jcenter()
+        maven { url = project.uri("https://mirrors.163.com/maven/repository/maven-public/") }
+        // maven 中国镜像，提供加速
         mavenCentral()
         maven { url = project.uri("https://jitpack.io") }
     }
+
+    val kotlinVersion: String by project
+
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 
 allprojects {
-    repositories{
+    repositories {
         mavenLocal()
+        maven { url = project.uri("https://maven.aliyun.com/repository/gradle-plugin/") }
         maven { url = project.uri("https://maven.aliyun.com/repository/public/") }
-        jcenter()
+        maven { url = project.uri("https://mirrors.163.com/maven/repository/maven-public/") }
+        // maven 中国镜像，提供加速
         mavenCentral()
         maven { url = project.uri("https://jitpack.io") }
-    }}
+    }
+}
 
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)

core/src/main/resources/.gitkeep

@@ -0,0 +1,7 @@
+# A hack to allow opening whole project dir in Intellij and using official code style.
+# Kotlin plugin does not import code style property from Gradle.
+# Instead it parses project's root gradle.properties file.
+kotlin.code.style=official
+
+# Version
+kotlinVersion=1.4.31

core/src/main/resources/application.properties

@@ -1,6 +1,5 @@
-#Sun Nov 03 20:02:05 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip