diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle index 659e119e2..2e587fa8e 100644 --- a/cavis-full/build.gradle +++ b/cavis-full/build.gradle @@ -12,13 +12,15 @@ configurations.archives.artifacts.with { archives -> dependencies { //Todo clean this api platform(project(":cavis-common-platform")) - api "org.bytedeco:javacpp:1.5.7" //for some reason we needed to apply version numbers here, they do not end up in POM otherwise + //api "org.bytedeco:javacpp:1.5.7" //for some reason we needed to apply version numbers here, they do not end up in POM otherwise api "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.5" api 'org.slf4j:slf4j-simple:2.0.3' api 'org.slf4j:slf4j-api:2.0.3' - api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86" + //TODO for the two below.. either platform specific uber jars or a single big one with all platforms + api group: "org.bytedeco", name: "javacpp", version: "1.5.7", classifier: "linux-x86_64" + //api group: "org.bytedeco", name: "javacpp", version: "1.5.7" api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT', classifier: "linux-x86_64-avx2-cpu" - + //api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT' rootProject.getAllprojects().each { Project sproj -> if(!sproj.name.equals(name) && !sproj.name.equals("cavis-common-platform") && !sproj.name.equals("Cavis") diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle index 10648759d..0a638ff15 100644 --- a/cavis-native/cavis-native-lib/build.gradle +++ b/cavis-native/cavis-native-lib/build.gradle @@ -84,7 +84,7 @@ chipList.each {thisChip -> } -if(osdetector.os.startsWith("windows")) { +//if(osdetector.os.startsWith("windows")) { sourceSets { main { java { @@ -93,7 +93,7 @@ if(osdetector.os.startsWith("windows")) { } } } -} +//} java { @@ -488,6 +488,7 @@ chipList.each { thisChip -> publishing { publications { mavenJava(MavenPublication) { + artifact jar artifact tasks.getByName("${thisChip}SupportJar") } }