Skip to content

Commit

Permalink
Replace compile with implementation or api
Browse files Browse the repository at this point in the history
  • Loading branch information
oujesky authored and ahadas committed Feb 26, 2021
1 parent c096ed3 commit e80d8d4
Showing 47 changed files with 250 additions and 172 deletions.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ allprojects {

subprojects {
apply plugin: 'biz.aQute.bnd.builder'
apply plugin: 'java-library'
compileJava.options.compilerArgs += ['--release', '8']
compileJava.options.encoding = 'UTF-8'
compileTestJava.options.encoding = 'UTF-8'
@@ -43,8 +44,8 @@ repositories {
}

dependencies {
compile 'org.apache.felix:org.apache.felix.main:6.0.3'
compile 'com.beust:jcommander:1.78'
implementation 'org.apache.felix:org.apache.felix.main:6.0.3'
implementation 'com.beust:jcommander:1.78'

osgiRuntime project('mucommander-core')
osgiRuntime project('mucommander-command')
6 changes: 3 additions & 3 deletions mucommander-archiver/build.gradle
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
compile project(':mucommander-format-tar')
compile project(':mucommander-format-zip')
api project(':mucommander-commons-file')
api project(':mucommander-format-tar')
api project(':mucommander-format-zip')

testImplementation 'org.testng:testng:6.11'
}
6 changes: 3 additions & 3 deletions mucommander-command/build.gradle
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@ plugins {
repositories.jcenter()

dependencies {
compile project(":mucommander-commons-file")
compile project(":mucommander-preferences")
compile 'org.slf4j:slf4j-api:1.7.26'
api project(":mucommander-commons-file")
api project(":mucommander-preferences")
implementation 'org.slf4j:slf4j-api:1.7.26'

testImplementation 'org.testng:testng:6.11'
}
2 changes: 1 addition & 1 deletion mucommander-commons-collections/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repositories.jcenter()

dependencies {
compile 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.slf4j:slf4j-api:1.7.26'

testImplementation 'org.testng:testng:6.11'
}
2 changes: 1 addition & 1 deletion mucommander-commons-conf/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repositories.jcenter()

dependencies {
compile 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.slf4j:slf4j-api:1.7.26'

testImplementation 'org.testng:testng:6.11'
}
12 changes: 6 additions & 6 deletions mucommander-commons-file/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-io')
compile project(':mucommander-commons-runtime')
compile project(':mucommander-commons-util')
api project(':mucommander-commons-io')
api project(':mucommander-commons-runtime')
api project(':mucommander-commons-util')

comprise 'net.java.dev.jna:jna:5.5.0'
comprise 'net.java.dev.jna:jna-platform:5.5.0'
compile 'org.slf4j:slf4j-api:1.7.26'
compile 'commons-collections:commons-collections:3.2.2'
compile 'org.osgi:osgi.core:7.0.0'
implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'commons-collections:commons-collections:3.2.2'
implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
testImplementation 'junit:junit:4.12'
2 changes: 1 addition & 1 deletion mucommander-commons-io/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repositories.jcenter()

dependencies {
compile 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.slf4j:slf4j-api:1.7.26'
comprise 'com.ibm.icu:icu4j:59.2'

testImplementation 'org.testng:testng:6.11'
2 changes: 1 addition & 1 deletion mucommander-commons-runtime/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repositories.jcenter()

dependencies {
compile 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.slf4j:slf4j-api:1.7.26'
testImplementation 'org.testng:testng:6.11'
}

4 changes: 2 additions & 2 deletions mucommander-commons-util/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
repositories.jcenter()

dependencies {
compile project(":mucommander-commons-runtime")
compile 'org.slf4j:slf4j-api:1.7.26'
api project(":mucommander-commons-runtime")
implementation 'org.slf4j:slf4j-api:1.7.26'

testImplementation 'org.testng:testng:6.11'
}
11 changes: 6 additions & 5 deletions mucommander-core/build.gradle
Original file line number Diff line number Diff line change
@@ -17,11 +17,12 @@ dependencies {
compileOnly project(':mucommander-os-api')
compileOnly project(':mucommander-viewer-api')

compile 'ch.qos.logback:logback-core:1.2.3'
compile 'ch.qos.logback:logback-classic:1.2.3'
compile 'org.jmdns:jmdns:3.5.5'
compile 'org.slf4j:slf4j-api:1.7.26'
compile 'org.osgi:osgi.core:7.0.0'
implementation 'ch.qos.logback:logback-core:1.2.3'
implementation 'ch.qos.logback:logback-classic:1.2.3'
implementation 'org.jmdns:jmdns:3.5.5'
implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'
implementation 'commons-collections:commons-collections:3.2.2'
comprise 'org.unix4j:unix4j-command:0.5'

testImplementation 'org.testng:testng:6.11'
6 changes: 3 additions & 3 deletions mucommander-encoding/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
repositories.jcenter()

dependencies {
compile project(":mucommander-commons-util")
compile project(":mucommander-preferences")
compile project(":mucommander-translator")
api project(":mucommander-commons-util")
api project(":mucommander-preferences")
api project(":mucommander-translator")

// Use JUnit test framework
testImplementation 'junit:junit:4.12'
5 changes: 4 additions & 1 deletion mucommander-format-ar/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,10 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
api project(':mucommander-commons-file')

implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
}
7 changes: 5 additions & 2 deletions mucommander-format-bzip2/build.gradle
Original file line number Diff line number Diff line change
@@ -2,8 +2,11 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
compile project(':apache-bzip2')
api project(':mucommander-commons-file')
api project(':apache-bzip2')

implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
}
4 changes: 3 additions & 1 deletion mucommander-format-gzip/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,9 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
api project(':mucommander-commons-file')

implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
}
5 changes: 4 additions & 1 deletion mucommander-format-iso/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,10 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
api project(':mucommander-commons-file')

implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
}
8 changes: 5 additions & 3 deletions mucommander-format-libguestfs/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
dependencies {
compile project(':mucommander-commons-file')
compile 'org.osgi:osgi.core:7.0.0'
compile files('libs/libguestfs.jar')
api project(':mucommander-commons-file')

implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'
implementation files('libs/libguestfs.jar')
}

repositories.jcenter()
5 changes: 4 additions & 1 deletion mucommander-format-lst/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,10 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
api project(':mucommander-commons-file')

implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
}
8 changes: 4 additions & 4 deletions mucommander-format-rar/build.gradle
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@ configurations {
}

dependencies {
compile project(':mucommander-commons-file')
compile 'org.osgi:osgi.core:7.0.0'
compile 'org.apache.commons:commons-vfs2:2.3'
compile 'com.github.junrar:junrar:4.0.0'
api project(':mucommander-commons-file')
implementation 'org.osgi:osgi.core:7.0.0'
implementation 'org.apache.commons:commons-vfs2:2.3'
implementation 'com.github.junrar:junrar:4.0.0'

testImplementation 'org.testng:testng:6.11'
}
5 changes: 4 additions & 1 deletion mucommander-format-sevenzip/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,10 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
api project(':mucommander-commons-file')

implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
}
7 changes: 5 additions & 2 deletions mucommander-format-tar/build.gradle
Original file line number Diff line number Diff line change
@@ -2,8 +2,11 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
compile project(':apache-bzip2')
api project(':mucommander-commons-file')
api project(':apache-bzip2')

implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
}
5 changes: 4 additions & 1 deletion mucommander-format-zip/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,10 @@
repositories.jcenter()

dependencies {
compile project(':mucommander-commons-file')
api project(':mucommander-commons-file')

implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

testImplementation 'org.testng:testng:6.11'
testImplementation project(':mucommander-commons-file')
10 changes: 5 additions & 5 deletions mucommander-os-api/build.gradle
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ plugins {
repositories.jcenter()

dependencies {
compile project(":mucommander-commons-file")
compile project(":mucommander-command")
compile project(":mucommander-process")
compile project(":mucommander-translator")
compile 'org.slf4j:slf4j-api:1.7.26'
api project(":mucommander-commons-file")
api project(":mucommander-command")
api project(":mucommander-process")
api project(":mucommander-translator")
implementation 'org.slf4j:slf4j-api:1.7.26'

// Use JUnit test framework
testImplementation 'junit:junit:4.12'
9 changes: 5 additions & 4 deletions mucommander-os-linux/build.gradle
Original file line number Diff line number Diff line change
@@ -13,10 +13,11 @@
repositories.jcenter()

dependencies {
compile project(":mucommander-core")
compile project(":mucommander-os-api")
compile project(":mucommander-process")
compile 'org.slf4j:slf4j-api:1.7.26'
api project(":mucommander-core")
api project(":mucommander-os-api")
api project(":mucommander-process")
implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

// Use JUnit test framework
testImplementation 'junit:junit:4.12'
15 changes: 8 additions & 7 deletions mucommander-os-macos-java8/build.gradle
Original file line number Diff line number Diff line change
@@ -17,15 +17,16 @@ repositories.jcenter()


dependencies {
compile project(":mucommander-commons-util")
compile project(":mucommander-core")
compile project(":mucommander-os-api")
compile project(":mucommander-process")
compile project(":mucommander-translator")
api project(":mucommander-commons-util")
api project(":mucommander-core")
api project(":mucommander-os-api")
api project(":mucommander-process")
api project(":mucommander-translator")

comprise 'net.java.dev.jna:jna-platform:5.5.0'
compile 'org.slf4j:slf4j-api:1.7.26'
compile 'com.googlecode.plist:dd-plist:1.23'
implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'com.googlecode.plist:dd-plist:1.23'
implementation 'org.osgi:osgi.core:7.0.0'

// Apple's Java extensions
compileOnly files('libs/java-extension.jar')
15 changes: 8 additions & 7 deletions mucommander-os-macos/build.gradle
Original file line number Diff line number Diff line change
@@ -18,15 +18,16 @@ repositories.jcenter()
compileJava.options.compilerArgs += ['--release', '11']

dependencies {
compile project(":mucommander-commons-util")
compile project(":mucommander-core")
compile project(":mucommander-os-api")
compile project(":mucommander-process")
compile project(":mucommander-translator")
api project(":mucommander-commons-util")
api project(":mucommander-core")
api project(":mucommander-os-api")
api project(":mucommander-process")
api project(":mucommander-translator")

comprise 'net.java.dev.jna:jna-platform:5.5.0'
compile 'org.slf4j:slf4j-api:1.7.26'
compile 'com.googlecode.plist:dd-plist:1.23'
implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'com.googlecode.plist:dd-plist:1.23'
implementation 'org.osgi:osgi.core:7.0.0'

// the java.desktop module that contains macOS-specific extensions
compileOnly files('libs/java.desktop.jar')
9 changes: 5 additions & 4 deletions mucommander-os-openvms/build.gradle
Original file line number Diff line number Diff line change
@@ -13,10 +13,11 @@
repositories.jcenter()

dependencies {
compile project(":mucommander-core")
compile project(":mucommander-commons-runtime")
compile project(":mucommander-os-api")
compile 'org.slf4j:slf4j-api:1.7.26'
api project(":mucommander-core")
api project(":mucommander-commons-runtime")
api project(":mucommander-os-api")
implementation 'org.slf4j:slf4j-api:1.7.26'
implementation 'org.osgi:osgi.core:7.0.0'

// Use JUnit test framework
testImplementation 'junit:junit:4.12'
Loading

0 comments on commit e80d8d4

Please sign in to comment.