diff --git a/.gitignore b/.gitignore index 8983379..7219eb8 100755 --- a/.gitignore +++ b/.gitignore @@ -220,8 +220,8 @@ pip-log.txt TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar #*.iml *.name -.idea/compiler.xml -*.xml +.idea +dependency-reduced-pom.xml TBMC/ /.apt_generated/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0de1f8c..56dd862 100755 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -3,13 +3,29 @@ + + + + + + + + + + + + + + + + - + @@ -24,24 +40,24 @@ - - + - + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 0b24af5..c3d052f 100755 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -5,6 +5,7 @@ + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1d962ae..7a60b95 100755 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,8 @@ before_install: | # Wget BuildTools and run if cached folder not found fi language: java jdk: - - oraclejdk8 + - oraclejdk11 sudo: true -dist: trusty # Needed for Java 8, although we might not need Java 8 deploy: # deploy develop to the staging environment - provider: script diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml index 8be4539..67aa057 100644 --- a/BuildConfigUpdater/BuildConfigUpdater.iml +++ b/BuildConfigUpdater/BuildConfigUpdater.iml @@ -5,7 +5,7 @@ - + diff --git a/ButtonCore/pom.xml b/ButtonCore/pom.xml index 752e64d..93d96e3 100755 --- a/ButtonCore/pom.xml +++ b/ButtonCore/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.TBMCPlugins - ButtonCore + com.github.TBMCPlugins.ButtonCore + CorePOM master-SNAPSHOT + ../CorePOM - com.github.TBMCPlugins.ButtonCore ButtonCore ButtonCore ButtonCore diff --git a/ButtonProcessor/ButtonProcessor.iml b/ButtonProcessor/ButtonProcessor.iml index d373248..a6bf3b9 100755 --- a/ButtonProcessor/ButtonProcessor.iml +++ b/ButtonProcessor/ButtonProcessor.iml @@ -6,7 +6,7 @@ - + diff --git a/CorePOM/CorePOM.iml b/CorePOM/CorePOM.iml new file mode 100644 index 0000000..0e07dc2 --- /dev/null +++ b/CorePOM/CorePOM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CorePOM/pom.xml b/CorePOM/pom.xml new file mode 100755 index 0000000..024d7eb --- /dev/null +++ b/CorePOM/pom.xml @@ -0,0 +1,108 @@ + + 4.0.0 + + com.github.TBMCPlugins.ButtonCore + CorePOM + pom + master-SNAPSHOT + + 1.18.10 + + Core POM for Chroma + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 8 + + + com.github.bsideup.jabel + jabel-javac-plugin + 0.2.0 + + + org.projectlombok + lombok + ${lombok.version} + + + com.github.TBMCPlugins.ButtonCore + ButtonProcessor + master-SNAPSHOT + + + + com.github.bsideup.jabel.JabelJavacProcessor + lombok.launch.AnnotationProcessorHider$AnnotationProcessor + + buttondevteam.buttonproc.ButtonProcessor + + + + + maven-surefire-plugin + + false + + + + + + + + + + jitpack.io + https://jitpack.io/ + + + + + + junit + junit + 3.8.1 + test + + + + org.projectlombok + lombok + ${lombok.version} + provided + + + + + + intellij-idea-only + + + idea.maven.embedder.version + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 13 + + --enable-preview + + + + + + + + diff --git a/pom.xml b/pom.xml index 422fc03..935e426 100755 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ ButtonCore Parent + CorePOM ButtonCore ButtonProcessor BuildConfigUpdater @@ -28,28 +29,6 @@ 3.8.1 8 - - - com.github.bsideup.jabel - jabel-javac-plugin - 0.2.0 - - - org.projectlombok - lombok - ${lombok.version} - - - com.github.TBMCPlugins.ButtonCore - ButtonProcessor - master-SNAPSHOT - - - - com.github.bsideup.jabel.JabelJavacProcessor - lombok.launch.AnnotationProcessorHider$AnnotationProcessor - buttondevteam.buttonproc.ButtonProcessor - @@ -77,29 +56,4 @@ provided - - - - intellij-idea-only - - - idea.maven.embedder.version - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 13 - - --enable-preview - - - - - - - \ No newline at end of file