spiffe
/
java-spiffe
mirror of https://github.com/spiffe/java-spiffe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49 from maxlambrecht/master 

Use google osdetector plugin instead of internal gradle class.
This commit is contained in:
Max Lambrecht 2020-11-24 15:11:10 -03:00 committed by GitHub
parent 48e72f0412 e7425fbd4e
commit accb81c8d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java-spiffe-core/build.gradle
View File

@ -39,7 +39,7 @@ protobuf {
} }
dependencies { dependencies {
if (gradle.ext.isMacOsX) { if (osdetector.os.is('osx') ) {
compileOnly(project('grpc-netty-macos')) compileOnly(project('grpc-netty-macos'))
testImplementation(project('grpc-netty-macos')) testImplementation(project('grpc-netty-macos'))
} else { } else {

2
java-spiffe-helper/build.gradle
View File

@ -19,7 +19,7 @@ dependencies {
api(project(':java-spiffe-core')) api(project(':java-spiffe-core'))
// runtimeOnly grpc-netty dependency module will be included in the shadowJar // runtimeOnly grpc-netty dependency module will be included in the shadowJar
if (gradle.ext.isMacOsX) { if (osdetector.os.is('osx') ) {
runtimeOnly(project(':java-spiffe-core:grpc-netty-macos')) runtimeOnly(project(':java-spiffe-core:grpc-netty-macos'))
} else { } else {
runtimeOnly(project(':java-spiffe-core:grpc-netty-linux')) runtimeOnly(project(':java-spiffe-core:grpc-netty-linux'))

2
java-spiffe-provider/build.gradle
View File

@ -17,7 +17,7 @@ dependencies {
api(project(":java-spiffe-core")) api(project(":java-spiffe-core"))
// runtimeOnly grpc-netty dependency module will be included in the shadowJar // runtimeOnly grpc-netty dependency module will be included in the shadowJar
if (gradle.ext.isMacOsX) { if (osdetector.os.is('osx') ) {
runtimeOnly(project(':java-spiffe-core:grpc-netty-macos')) runtimeOnly(project(':java-spiffe-core:grpc-netty-macos'))
} else { } else {
runtimeOnly(project(':java-spiffe-core:grpc-netty-linux')) runtimeOnly(project(':java-spiffe-core:grpc-netty-linux'))

3
settings.gradle
View File

@ -1,6 +1,3 @@
import org.gradle.internal.os.OperatingSystem
gradle.ext.isMacOsX = OperatingSystem.current().isMacOsX()
rootProject.name = 'java-spiffe' rootProject.name = 'java-spiffe'
include 'java-spiffe-core' include 'java-spiffe-core'
include 'java-spiffe-provider' include 'java-spiffe-provider'