Przeglądaj źródła

Fix a few things with the git ignore file and wrapper.

Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>
Gabriel Harris-Rouquette 6 lat temu
rodzic
commit
925ef21a8e
5 zmienionych plików z 243 dodań i 177 usunięć
  1. 234 177
      .gitignore
  2. 4 0
      build.gradle.kts
  3. 5 0
      buildSrc/build.gradle.kts
  4. BIN
      gradle/wrapper/gradle-wrapper.jar
  5. 0 0
      gradlew

+ 234 - 177
.gitignore

@@ -1,105 +1,129 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Gradle template
-.gradle
-/build/
 
-# Ignore Gradle GUI config
-gradle-app.setting
+### Eclipse template
 
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
 
-# Cache of project
-.gradletasknamecache
+# External tool builders
+.externalToolBuilders/
 
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
-### Java template
-# Compiled class file
-*.class
+# Locally stored "Eclipse launch configurations"
+*.launch
 
-# Log file
-*.log
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
 
-# BlueJ files
-*.ctxt
+# CDT-specific (C/C++ Development Tooling)
+.cproject
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# CDT- autotools
+.autotools
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
+# Java annotation processor (APT)
+.factorypath
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# PDT-specific (PHP Development Tools)
+.buildpath
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-.idea/
+# sbteclipse plugin
+.target
 
-# 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
+# Tern plugin
+.tern-project
 
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
+# TeXlipse plugin
+.texlipse
 
-# 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/modules.xml
- .idea/*.iml
- .idea/modules
+# STS (Spring Tool Suite)
+.springBeans
 
-# CMake
-cmake-build-*/
+# Code Recommenders
+.recommenders/
 
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
+# Annotation Processing
+.apt_generated/
 
-# File-based project format
-*.iws
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+### Android template
+# Built application files
+*.apk
+*.ap_
 
-# IntelliJ
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+gen/
 out/
 
-# mpeltonen/sbt-idea plugin
-.idea_modules/
+# Gradle files
+.gradle/
+build/
 
-# JIRA plugin
-atlassian-ide-plugin.xml
+# Local configuration file (sdk path, etc)
+# Proguard folder generated by Eclipse
+proguard/
 
-# Cursive Clojure plugin
-.idea/replstate.xml
+# Log Files
+*.log
 
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
+# Android Studio Navigation editor temp files
+.navigation/
 
-# Editor-based Rest Client
-.idea/httpRequests
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+### Dropbox template
+# Dropbox settings and caches
+.dropbox
+.dropbox.attr
+.dropbox.cache
 ### Windows template
 # Windows thumbnail cache files
 Thumbs.db
@@ -135,30 +159,39 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 .mvn/wrapper/maven-wrapper.jar
-### Kotlin template
-# Compiled class file
-*.class
-
-# Log file
-*.log
+### NetBeans template
+nbproject/private/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
 
-# BlueJ files
-*.ctxt
+# Icon must end with two \r
+Icon
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# Thumbnails
+._*
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
 ### Linux template
 *~
 
@@ -173,101 +206,125 @@ hs_err_pid*
 
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
-### Eclipse template
+### GPG template
+secring.*
 
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
+### Gradle template
+.gradle
+/build/
 
-# External tool builders
-.externalToolBuilders/
+# Ignore Gradle GUI config
+gradle-app.setting
 
-# Locally stored "Eclipse launch configurations"
-*.launch
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
 
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
+# Cache of project
+.gradletasknamecache
 
-# CDT-specific (C/C++ Development Tooling)
-.cproject
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+### SBT template
+# Simple Build Tool
+# http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
+
+dist/*
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+.history
+.cache
+.lib/
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+out
+gen### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# CDT- autotools
-.autotools
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
 
-# Java annotation processor (APT)
-.factorypath
+# 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
 
-# PDT-specific (PHP Development Tools)
-.buildpath
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
 
-# sbteclipse plugin
-.target
+# 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/modules.xml
+# .idea/*.iml
+# .idea/modules
 
-# Tern plugin
-.tern-project
+# CMake
+cmake-build-*/
 
-# TeXlipse plugin
-.texlipse
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
 
-# STS (Spring Tool Suite)
-.springBeans
+# File-based project format
+*.iws
 
-# Code Recommenders
-.recommenders/
+# IntelliJ
+# mpeltonen/sbt-idea plugin
+.idea_modules/
 
-# Annotation Processing
-.apt_generated/
+# JIRA plugin
+atlassian-ide-plugin.xml
 
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-### VisualStudioCode template
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-### NetBeans template
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-.nb-gradle/
-### macOS template
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
+# Cursive Clojure plugin
+.idea/replstate.xml
 
-# Icon must end with two \r
-Icon
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
 
-# Thumbnails
-._*
+# Editor-based Rest Client
+.idea/httpRequests
+### Kotlin template
+# Compiled class file
+# Log file
+# BlueJ files
+*.ctxt
 
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
 
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+# 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*
+### Java template
+# Compiled class file
+# Log file
+# BlueJ files
+# Mobile Tools for Java (J2ME)
+# Package Files #
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml

+ 4 - 0
build.gradle.kts

@@ -11,6 +11,10 @@ buildscript {
     }
 }
 
+val wrapper by tasks.getting(Wrapper::class) {
+  gradleVersion = "4.9"
+}
+
 // Things used by other projects
 Projects.core = project("core")
 Projects.bukkit = project("bukkit")

+ 5 - 0
buildSrc/build.gradle.kts

@@ -1,3 +1,8 @@
 plugins {
     `kotlin-dsl`
 }
+
+repositories {
+    jcenter()
+}
+

BIN
gradle/wrapper/gradle-wrapper.jar


+ 0 - 0
gradlew