yoink code to new java version

IZPL-A/IZPL/app/build.gradle

@@ -25,10 +25,10 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
-    compile files('libs/izpl-shared.jar')
-    compile 'com.android.support:appcompat-v7:22.1.1'
-    compile project(':filechooser')
-    compile 'org.apache.logging.log4j:log4j-api:2.+'
-    compile project(':exoplayer')
+    api fileTree(dir: 'libs', include: '*.jar')
+    api files('libs/izpl-shared.jar')
+    api 'com.android.support:appcompat-v7:22.1.1'
+    api project(':filechooser')
+    api 'org.apache.logging.log4j:log4j-api:2.+'
+    api project(':exoplayer')
 }

IZPL-A/IZPL/filechooser/build.gradle

@@ -1,30 +1,30 @@
-apply plugin: 'com.android.library'
-
-
-android {
-    compileSdkVersion 21
-    buildToolsVersion "21.0.2"
-
-    defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.1.1'
-}
+apply plugin: 'com.android.library'
+
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.0.2"
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 21
+        versionCode 1
+        versionName "1.0"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'com.android.support:appcompat-v7:22.1.1'
+}

IZSetup/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 
 sourceCompatibility = 1.8
@@ -78,16 +78,16 @@ jar{
 }
 
 dependencies{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile "commons-io:commons-io:2.+"
-	compile 'org.apache.commons:commons-exec:1.3'
-	compile "org.yaml:snakeyaml:1.14"
-	compile "commons-net:commons-net:3.3"
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
-	 compile	'org.xerial:sqlite-jdbc:3.8.7'
-			compile(project(':ToolKit')) {
+	api fileTree(dir: 'lib', include: '*.jar')
+	api "commons-io:commons-io:2.+"
+	api 'org.apache.commons:commons-exec:1.3'
+	api "org.yaml:snakeyaml:1.14"
+	api "commons-net:commons-net:3.3"
+    api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+	 api	'org.xerial:sqlite-jdbc:3.8.7'
+			api(project(':ToolKit')) {
         transitive = false
     }
 

LogBlockHeatMapper/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 
 
@@ -23,5 +23,5 @@ repositories{
 }
 
 dependencies{
-    compile group: 'com.alexdupre', name: 'pngj', version: '2+'
+    api group: 'com.alexdupre', name: 'pngj', version: '2+'
 }

MazeViewer/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 
 
@@ -24,11 +24,11 @@ repositories{
 
 
 dependencies{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile "commons-io:commons-io:2.+"
-	compile 'org.apache.commons:commons-exec:1.3'
-	compile "org.yaml:snakeyaml:1.14"
-	compile(project(':ToolKit')) {
+	api fileTree(dir: 'lib', include: '*.jar')
+	api "commons-io:commons-io:2.+"
+	api 'org.apache.commons:commons-exec:1.3'
+	api "org.yaml:snakeyaml:1.14"
+	api(project(':ToolKit')) {
         transitive = false
     }
 

QuickStuff/build.gradle

@@ -1,7 +1,7 @@
-defaultTasks 'distZip'
-
-apply plugin: 'java'
-dependencies{
-    compile(project(':ToolKit')) {
-    }
-}
+defaultTasks 'distZip'
+
+apply plugin: 'java-library'
+dependencies{
+    api(project(':ToolKit')) {
+    }
+}

SenaBitWiggler/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 
 
@@ -23,7 +23,7 @@ repositories{
 }
 
 dependencies{
-    compile "org.yaml:snakeyaml:1.14"
-    compile("com.google.guava:guava:31.0.1-jre")
-	compile( 'info.picocli:picocli:4.6.2')
+    api "org.yaml:snakeyaml:1.14"
+    api("com.google.guava:guava:31.0.1-jre")
+	api( 'info.picocli:picocli:4.6.2')
 }

TWPUtil/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 
 
@@ -24,15 +24,15 @@ repositories{
 
 
 dependencies{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile "commons-io:commons-io:2.+"
-	compile 'org.apache.commons:commons-exec:1.3'
-	compile "org.yaml:snakeyaml:1.14"
-    compile	'org.xerial:sqlite-jdbc:3.8.7'
-	compile 'mysql:mysql-connector-java:5.1.6'
+	api fileTree(dir: 'lib', include: '*.jar')
+	api "commons-io:commons-io:2.+"
+	api 'org.apache.commons:commons-exec:1.3'
+	api "org.yaml:snakeyaml:1.14"
+    api	'org.xerial:sqlite-jdbc:3.8.7'
+	api 'mysql:mysql-connector-java:5.1.6'
 	
-	compile 'org.im4java:im4java:1.4.0'
-	compile(project(':ToolKit')) {
+	api 'org.im4java:im4java:1.4.0'
+	api(project(':ToolKit')) {
         transitive = false
     }
 

ToolKit/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 sourceCompatibility = 1.8
 version = 'SNAPSHOT'
@@ -17,21 +17,21 @@ distZip.outputs.file file(tasks.jar.archivePath)
 
 dependencies{
 	
-	compile fileTree(dir: 'lib', include: '*.jar')
-	//compile "net.rubygrapefruit:native-platform:0.10"
-	compile "commons-io:commons-io:2.+"
-	compile 'org.apache.commons:commons-exec:1.3'
-	compile "org.yaml:snakeyaml:1.14"
-	compile "commons-net:commons-net:3.3"
-	compile 'org.ini4j:ini4j:0.5.2'
-	compile 'org.im4java:im4java:1.4.0'
-    compile 'net.java.dev.jna:jna:4.1.0'
-    compile 'net.java.dev.jna:jna-platform:4.1.0'
-	//compile 'uk.co.caprica:vlcj:3.0.1' //HACK! bezüglich JNA
-    compile	'org.xerial:sqlite-jdbc:3.8.7'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
-	compile 'mysql:mysql-connector-java:5.1.6'
+	api fileTree(dir: 'lib', include: '*.jar')
+	//api "net.rubygrapefruit:native-platform:0.10"
+	api "commons-io:commons-io:2.+"
+	api 'org.apache.commons:commons-exec:1.3'
+	api "org.yaml:snakeyaml:1.14"
+	api "commons-net:commons-net:3.3"
+	api 'org.ini4j:ini4j:0.5.2'
+	api 'org.im4java:im4java:1.4.0'
+    api 'net.java.dev.jna:jna:4.1.0'
+    api 'net.java.dev.jna:jna-platform:4.1.0'
+	//api 'uk.co.caprica:vlcj:3.0.1' //HACK! bezüglich JNA
+    api	'org.xerial:sqlite-jdbc:3.8.7'
+    api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+	api 'mysql:mysql-connector-java:5.1.6'
 
 }

UpidTK/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 
 
@@ -31,15 +31,15 @@ options.compilerArgs << '-XDignore.symbol.file'
 }
 
 dependencies{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile "commons-io:commons-io:2.+"
-	compile 'org.apache.commons:commons-exec:1.3'
-    compile	'org.xerial:sqlite-jdbc:3.8.7'
-	compile 'mysql:mysql-connector-java:5.1.6'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
-	compile(project(':ToolKit')) {
+	api fileTree(dir: 'lib', include: '*.jar')
+	api "commons-io:commons-io:2.+"
+	api 'org.apache.commons:commons-exec:1.3'
+    api	'org.xerial:sqlite-jdbc:3.8.7'
+	api 'mysql:mysql-connector-java:5.1.6'
+    api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+	api(project(':ToolKit')) {
         transitive = false
     }
 

WPCMGr/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 apply from: "$rootDir/utils/IO.gradle"
 
@@ -59,28 +59,29 @@ distZip {
     from(startScripts.outputDir)
 	include '*c.bat'
   }
+  duplicatesStrategy = 'include'
 }
 
 dependencies{
-	compile fileTree(dir: 'lib', include: '*.jar')
-        //compile "net.rubygrapefruit:native-platform:0.9"
-	compile "commons-io:commons-io:2.+"
-	compile 'org.apache.commons:commons-exec:1.3'
-	compile "org.yaml:snakeyaml:+"
-	compile 'org.ini4j:ini4j:0.5.2'
-	compile 'mysql:mysql-connector-java:5.1.6'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
-    compile 'org.fusesource.jansi:jansi:1.11'
-    compile 'commons-cli:commons-cli:1.3'
-	compile(project(':ToolKit')) {
+	api fileTree(dir: 'lib', include: '*.jar')
+        //api "net.rubygrapefruit:native-platform:0.9"
+	api "commons-io:commons-io:2.+"
+	api 'org.apache.commons:commons-exec:1.3'
+	api "org.yaml:snakeyaml:+"
+	api 'org.ini4j:ini4j:0.5.2'
+	api 'mysql:mysql-connector-java:5.1.6'
+    api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+    api 'org.fusesource.jansi:jansi:1.11'
+    api 'commons-cli:commons-cli:1.3'
+	api(project(':ToolKit')) {
         transitive = false
         
     }
-    compile(project(':external:java-progressbar'))
-    compile 'net.java.dev.jna:jna:4.1.0'
-    compile 'net.java.dev.jna:jna-platform:4.1.0'
+    api(project(':external:java-progressbar'))
+    api 'net.java.dev.jna:jna:4.1.0'
+    api 'net.java.dev.jna:jna-platform:4.1.0'
 
 
 	

build.gradle

@@ -1,4 +1,5 @@
-defaultTasks 'distZip',':izsetup:izsetupDist'
+defaultTasks 'distZip'
+// ,':izsetup:izsetupDist'
 buildscript {
   repositories {
 		maven {

external/java-progressbar/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 compileJava.options.encoding = 'UTF-8'
 
@@ -8,8 +8,8 @@ repositories {
 }
 
 dependencies {
-	compile group: 'com.google.guava', name: 'guava', version: '19.0'
-	testCompile group: 'org.testng', name: 'testng', version: '6.9.10'
+	api group: 'com.google.guava', name: 'guava', version: '19.0'
+	testImplementation group: 'org.testng', name: 'testng', version: '6.9.10'
 }
 
 test {
@@ -17,11 +17,3 @@ test {
 		suites 'testng.xml' 
 	}
 }
-
-uploadArchives {
-	repositories {
-		flatDir {
-			dirs 'repos'
-		}
-	}
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

iZStreamer/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 
 
@@ -13,14 +13,14 @@ repositories{
 }
 
 dependencies{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile "commons-io:commons-io:2.+"
-	compile 'org.apache.commons:commons-exec:1.3'
-	compile "org.yaml:snakeyaml:1.14"
-	compile "commons-net:commons-net:3.3"
-    compile 'net.java.dev.jna:jna:3.5.2'
-	compile 'uk.co.caprica:vlcj:3.0.1' //HACK! bezüglich JNA
-	compile(project(':ToolKit')) {
+	api fileTree(dir: 'lib', include: '*.jar')
+	api "commons-io:commons-io:2.+"
+	api 'org.apache.commons:commons-exec:1.3'
+	api "org.yaml:snakeyaml:1.14"
+	api "commons-net:commons-net:3.3"
+    api 'net.java.dev.jna:jna:3.5.2'
+	api 'uk.co.caprica:vlcj:3.0.1' //HACK! bezüglich JNA
+	api(project(':ToolKit')) {
         transitive = false
     }
 

iZlaunch/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 
 
@@ -21,11 +21,11 @@ options.compilerArgs << '-XDignore.symbol.file'
 }
 
 dependencies{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile "commons-io:commons-io:2.+"
-	compile 'org.apache.commons:commons-exec:1.3'
-	compile "commons-net:commons-net:3.3"
-	compile(project(':ToolKit')) {
+	api fileTree(dir: 'lib', include: '*.jar')
+	api "commons-io:commons-io:2.+"
+	api 'org.apache.commons:commons-exec:1.3'
+	api "commons-net:commons-net:3.3"
+	api(project(':ToolKit')) {
         transitive = false
     }
 

iZpaqSFX/build.gradle

@@ -1,6 +1,6 @@
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 
 sourceCompatibility = 1.8

iZpl-server/build.gradle

@@ -1,10 +1,10 @@
-apply plugin: 'war'
-
-
-
-dependencies{
-
-    compile(project(':izpl-shared')) {
-        transitive = false
-    }
+apply plugin: 'war'
+
+
+
+dependencies{
+
+    implementation(project(':izpl-shared')) {
+        transitive = false
+    }
 }

iZpl/build.gradle

@@ -7,7 +7,7 @@ evaluationDependsOn(':iZplPlugins:Extractor')
 evaluationDependsOn(':iZplPlugins:discordjukebox')
 defaultTasks 'distZip'
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'application'
 apply from: "$rootDir/utils/IO.gradle"
 
@@ -103,6 +103,7 @@ distZip {
         from project(':iZplPlugins:Extractor').jar
         from project(':iZplPlugins:discordjukebox').jar
   }
+  duplicatesStrategy = 'include'
 }
 
 task apiJar(type: Jar, dependsOn: compileJava) {
@@ -122,29 +123,29 @@ sourceSets{
     }
 }
 dependencies{
-    compile fileTree(dir: 'lib', include: '*.jar')
-    //compile "net.rubygrapefruit:native-platform:0.9"
-    compile "commons-io:commons-io:2.+"
-    compile 'org.apache.commons:commons-exec:1.3'
-    compile "org.yaml:snakeyaml:1.14"
-    compile "commons-net:commons-net:3.3"
-    compile 'uk.co.caprica:vlcj:4.+'
-    compile 'com.googlecode.mp4parser:isoparser:1.0-RC-1'
-    compile 'net.java.truevfs:truevfs-profile-default_2.11:0.12.0'
-    compile 'commons-cli:commons-cli:1.3'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.+'
-    compile 'org.fusesource.jansi:jansi:1.11'
-    compile 'org.jgrapht:jgrapht-core:0.9.0'
-    compile(project(':external:java-progressbar'))
+    api fileTree(dir: 'lib', include: '*.jar')
+    //api "net.rubygrapefruit:native-platform:0.9"
+    api "commons-io:commons-io:2.+"
+    api 'org.apache.commons:commons-exec:1.3'
+    api "org.yaml:snakeyaml:1.14"
+    api "commons-net:commons-net:3.3"
+    api 'uk.co.caprica:vlcj:4.+'
+    api 'com.googlecode.mp4parser:isoparser:1.0-RC-1'
+    api 'net.java.truevfs:truevfs-profile-default_2.11:0.12.0'
+    api 'commons-cli:commons-cli:1.3'
+	api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+    api group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
+    api group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.+'
+    api 'org.fusesource.jansi:jansi:1.11'
+    api 'org.jgrapht:jgrapht-core:0.9.0'
+    api(project(':external:java-progressbar'))
     
-    compile(project(':ToolKit')) {
+    api(project(':ToolKit')) {
         transitive = false
     }
-    compile(project(':izpl-shared'))
+    api(project(':izpl-shared'))
 }
 
 

iZplPlugins/Editor/build.gradle

@@ -1,19 +1,19 @@
-apply plugin:'java'
-task distZip(dependsOn: 'jar') {
-	//NO-OPtask als redirect
-}
-
-
-
-
-
-compileJava.options.encoding = 'UTF-8'
-dependencies
-{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile project(':iZpl')
-   
-
-}
-
-
+apply plugin: 'java-library'
+task distZip(dependsOn: 'jar') {
+	//NO-OPtask als redirect
+}
+
+
+
+
+
+compileJava.options.encoding = 'UTF-8'
+dependencies
+{
+	api fileTree(dir: 'lib', include: '*.jar')
+	api project(':iZpl')
+   
+
+}
+
+

iZplPlugins/Extractor/build.gradle

@@ -1,12 +1,12 @@
-apply plugin:'java'
+apply plugin: 'java-library'
 task distZip(dependsOn: 'jar') {
 	//NO-OPtask als redirect
 }
 
 dependencies
 {
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile project(':iZpl')
+	api fileTree(dir: 'lib', include: '*.jar')
+	api project(':iZpl')
 }
 
 

iZplPlugins/GameRadio/build.gradle

@@ -1,12 +1,12 @@
-apply plugin:'java'
-task distZip(dependsOn: 'jar') {
-	//NO-OPtask als redirect
-}
-
-dependencies
-{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile project(':iZpl')
-}
-
-
+apply plugin:'java-library'
+task distZip(dependsOn: 'jar') {
+	//NO-OPtask als redirect
+}
+
+dependencies
+{
+	api fileTree(dir: 'lib', include: '*.jar')
+	api project(':iZpl')
+}
+
+

iZplPlugins/ITunes/build.gradle

@@ -1,24 +1,24 @@
-apply plugin:'java'
-task distZip(dependsOn: 'fatJar') {
-	//NO-OPtask als redirect
-}
-
-task fatJar(type: Jar) {
-		manifest{
-		attributes 'Implementation-Title': 'iZSetup',
-					'Implementation-Version': 'SNAPSHOT',
-					'Main-Class': 'de.nplusc.izc.InstallPak.Main'
-					
-	}
-    baseName = project.name + '-all'
-    from { zipTree("lib/com4j.jar")  }
-    with jar
-}
-
-dependencies
-{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile project(':iZpl')
-}
-
-
+apply plugin: 'java-library'
+task distZip(dependsOn: 'fatJar') {
+	//NO-OPtask als redirect
+}
+
+task fatJar(type: Jar) {
+		manifest{
+		attributes 'Implementation-Title': 'iZSetup',
+					'Implementation-Version': 'SNAPSHOT',
+					'Main-Class': 'de.nplusc.izc.InstallPak.Main'
+					
+	}
+    baseName = project.name + '-all'
+    from { zipTree("lib/com4j.jar")  }
+    with jar
+}
+
+dependencies
+{
+	api fileTree(dir: 'lib', include: '*.jar')
+	api project(':iZpl')
+}
+
+

iZplPlugins/JukeBox/build.gradle

@@ -1,4 +1,4 @@
-apply plugin:'java'
+apply plugin: 'java-library'
 
 apply plugin: 'application'
 apply from: "$rootDir/utils/IO.gradle"
@@ -80,6 +80,7 @@ distZip {
     from(startScripts.outputDir)
 	include '*c.bat'
   }
+  duplicatesStrategy = 'include'
 }
 
 
@@ -87,25 +88,25 @@ distZip {
 compileJava.options.encoding = 'UTF-8'
 dependencies
 {
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile (project(path: ':iZpl', configuration: 'apistub')){
+	api fileTree(dir: 'lib', include: '*.jar')
+	api (project(path: ':iZpl', configuration: 'apistub')){
         transitive = false
         
         // HACK for the light-mode standalone
     }
-    compile(project(':ToolKit')) {
+    api(project(':ToolKit')) {
         transitive = false
     }
-    compile(project(':izpl-shared')){
+    api(project(':izpl-shared')){
         transitive = false
     }
     
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.+'
-    compile "org.yaml:snakeyaml:1.14"
+    api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+    api group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
+    api group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.+'
+    api "org.yaml:snakeyaml:1.14"
 }
 
 

iZplPlugins/Smartphonizer/build.gradle

@@ -1,19 +1,19 @@
-apply plugin:'java'
-task distZip(dependsOn: 'jar') {
-	//NO-OPtask als redirect
-}
-
-
-
-
-
-compileJava.options.encoding = 'UTF-8'
-dependencies
-{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile project(':iZpl')
-   
-
-}
-
-
+apply plugin: 'java-library'
+task distZip(dependsOn: 'jar') {
+	//NO-OPtask als redirect
+}
+
+
+
+
+
+compileJava.options.encoding = 'UTF-8'
+dependencies
+{
+	api fileTree(dir: 'lib', include: '*.jar')
+	api project(':iZpl')
+   
+
+}
+
+

iZplPlugins/WMP/build.gradle

@@ -1,24 +1,24 @@
-apply plugin:'java'
-task distZip(dependsOn: 'fatJar') {
-	//NO-OPtask als redirect
-}
-
-task fatJar(type: Jar) {
-		manifest{
-		attributes 'Implementation-Title': 'iZPlaylist-WMP',
-					'Implementation-Version': 'SNAPSHOT'
-					
-	}
-    baseName = project.name + '-all'
-    from { zipTree("lib/com4j.jar")  }
-    with jar
-}
-
-
-dependencies
-{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile project(':iZpl')
-}
-
-
+apply plugin: 'java-library'
+task distZip(dependsOn: 'fatJar') {
+	//NO-OPtask als redirect
+}
+
+task fatJar(type: Jar) {
+		manifest{
+		attributes 'Implementation-Title': 'iZPlaylist-WMP',
+					'Implementation-Version': 'SNAPSHOT'
+					
+	}
+    baseName = project.name + '-all'
+    from { zipTree("lib/com4j.jar")  }
+    with jar
+}
+
+
+dependencies
+{
+	api fileTree(dir: 'lib', include: '*.jar')
+	api project(':iZpl')
+}
+
+

iZplPlugins/discordjukebox/build.gradle

@@ -1,4 +1,4 @@
-apply plugin:'java'
+apply plugin: 'java-library'
 task distZip(dependsOn: 'jar') {
 	//NO-OPtask als redirect
 }
@@ -10,8 +10,8 @@ task distZip(dependsOn: 'jar') {
 compileJava.options.encoding = 'UTF-8'
 dependencies
 {
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile project(':iZpl')
+	api fileTree(dir: 'lib', include: '*.jar')
+	api project(':iZpl')
    
 
 }

iZplPlugins/foobar2000_others/build.gradle

@@ -1,13 +1,13 @@
-apply plugin:'java'
-
-task distZip(dependsOn: 'jar') {
-	//NO-OPtask als redirect
-}
-
-
-dependencies
-{
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile(project(':iZpl'))
-}
-
+apply plugin: 'java-library'
+
+task distZip(dependsOn: 'jar') {
+	//NO-OPtask als redirect
+}
+
+
+dependencies
+{
+	api fileTree(dir: 'lib', include: '*.jar')
+	api(project(':iZpl'))
+}
+

iZplPlugins/rtsslink/build.gradle

@@ -1,4 +1,4 @@
-apply plugin:'java'
+apply plugin: 'java-library'
 task distZip(dependsOn: 'jar') {
 	//NO-OPtask als redirect
 }
@@ -10,8 +10,8 @@ task distZip(dependsOn: 'jar') {
 compileJava.options.encoding = 'UTF-8'
 dependencies
 {
-	compile fileTree(dir: 'lib', include: '*.jar')
-	compile project(':iZpl')
+	api fileTree(dir: 'lib', include: '*.jar')
+	api project(':iZpl')
    
 
 }

izpl-shared/build.gradle

@@ -1,13 +1,13 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 dependencies{
-    compile fileTree(dir: 'lib', include: '*.jar')
-    compile "org.yaml:snakeyaml:1.14"
-	compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
-	compile "net.jthink:jaudiotagger:2+"
+    api fileTree(dir: 'lib', include: '*.jar')
+    api "org.yaml:snakeyaml:1.14"
+	api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	api group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+    api group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
+	api "net.jthink:jaudiotagger:2+"
 }