Merge remote-tracking branch 'origin/release/2.x'

wooga · Jul 14, 2021 · 52a64c6 · 52a64c6
2 parents be4328f + bcfc26d
commit 52a64c6
Show file tree

Hide file tree

Showing 171 changed files with 4,954 additions and 29,143 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,15 +18,17 @@
 
 withCredentials([usernameColonPassword(credentialsId: 'artifactory_publish', variable: 'artifactory_publish'),
                  usernameColonPassword(credentialsId: 'artifactory_deploy', variable: 'artifactory_deploy'),
-                 string(credentialsId: 'atlas_unity_coveralls_token', variable: 'coveralls_token')]) {
+                 string(credentialsId: 'atlas_unity_coveralls_token', variable: 'coveralls_token'),
+                 string(credentialsId: 'atlas_plugins_sonar_token', variable: 'sonar_token')]) {
 
     def testEnvironment = [
                             "artifactoryCredentials=${artifactory_publish}",
                             "nugetkey=${artifactory_deploy}"
                           ]
 
-    buildGradlePlugin plaforms: ['osx','windows','linux'],
+    buildGradlePlugin platforms: ['macos','windows','linux'],
                       coverallsToken: coveralls_token,
+                      sonarToken: sonar_token,
                       testEnvironment: testEnvironment,
                       labels: 'primary'
 }
diff --git a/README.md b/README.md
@@ -104,28 +104,28 @@ Gradle and Java Compatibility
 Built with Oracle JDK7
 Tested with Oracle JDK8
 
-| Gradle Version | Works       |
-| :------------- | :---------: |
-| <= 2.14        | ![no]       |
-| 3.0            | ![yes]      |
-| 3.1            | ![yes]      |
-| 3.2            | ![yes]      |
-| 3.3            | ![yes]      |
-| 3.4            | ![yes]      |
-| 3.4.1          | ![yes]      |
-| 3.5            | ![yes]      |
-| 3.5.1          | ![yes]      |
-| 4.0            | ![yes]      |
-| 4.1            | ![yes]      |
-| 4.2            | ![yes]      |
-| 4.3            | ![yes]      |
-| 4.4            | ![yes]      |
-| 4.5            | ![yes]      |
-| 4.6            | ![yes]      |
-| 4.7            | ![yes]      |
-| 4.8            | ![yes]      |
-| 4.9            | ![yes]      |
-| 4.10           | ![yes]      |
+| Gradle Version  | Works  |
+| :-------------: | :----: |
+| < 5.1           | ![no]  |
+| 5.1             | ![yes] |
+| 5.2             | ![yes] |
+| 5.3             | ![yes] |
+| 5.4             | ![yes] |
+| 5.5             | ![yes] |
+| 5.6             | ![yes] |
+| 5.6             | ![yes] |
+| 6.0             | ![yes] |
+| 6.1             | ![yes] |
+| 6.2             | ![yes] |
+| 6.3             | ![yes] |
+| 6.4             | ![yes] |
+| 6.5             | ![yes] |
+| 6.6             | ![yes] |
+| 6.6             | ![yes] |
+| 6.7             | ![yes] |
+| 6.8             | ![yes] |
+| 6.9             | ![yes] |
+| 7.0             | ![yes] |
 
 
 Development

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Wooga GmbH
+ * Copyright 2021 Wooga GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    id 'net.wooga.plugins' version '1.5.0'
+    id 'net.wooga.plugins' version '2.2.0'
 }
 
 group 'net.wooga.gradle'
@@ -41,17 +41,17 @@ github {
 }
 
 dependencies {
-    testCompile('org.jfrog.artifactory.client:artifactory-java-client-services:+') {
+    testImplementation('org.jfrog.artifactory.client:artifactory-java-client-services:+') {
         exclude module: 'logback-classic'
     }
 
-    testCompile("com.wooga.spock.extensions:spock-unity-version-manager-extension:0.1.0") {
+    testImplementation("com.wooga.spock.extensions:spock-unity-version-manager-extension:0.1.0") {
         exclude module: 'groovy-all'
     }
 
-    testCompile 'com.github.stefanbirkner:system-rules:1.18.0'
+    testImplementation 'com.github.stefanbirkner:system-rules:1.18.0'
 
-    compile 'org.apache.maven:maven-artifact:3.6.3'
-    compile "org.yaml:snakeyaml:1.28"
-    compile 'net.wooga:unity-version-manager-jni:1.+'
+    implementation 'org.apache.maven:maven-artifact:3.8.1'
+    implementation "org.yaml:snakeyaml:1.28"
+    implementation 'net.wooga:unity-version-manager-jni:[1,2)'
 }