diff -Nru native-platform-0.3-rc-2/build.gradle native-platform-0.3-rc-2-gil/build.gradle --- native-platform-0.3-rc-2/build.gradle 2013-02-25 23:04:25.000000000 +0100 +++ native-platform-0.3-rc-2-gil/build.gradle 2013-04-30 10:48:08.520536630 +0200 @@ -4,11 +4,13 @@ allprojects { apply plugin: 'java' apply plugin: 'idea' - apply plugin: 'maven' + //apply plugin: 'maven' repositories { - mavenCentral() - maven { url "http://repo.gradle.org/gradle/libs-releases-local" } + ivy { + artifactPattern "/usr/share/java/[module]-[revision].[ext]" + artifactPattern "/usr/share/java/[module].[ext]" + } } dependencies { @@ -21,22 +23,27 @@ sourceCompatibility = 1.5 targetCompatibility = 1.5 - tasks.withType(Upload) { - repositories { - mavenDeployer { - if (project.hasProperty('release')) { - repository(url: uri("https://gradle.artifactoryonline.com/gradle/libs-releases-local")) { - authentication(userName: artifactoryUserName, password: artifactoryPassword) - } - } else { - repository(url: uri("$rootProject.buildDir/repo")) - } - } - } - } +// tasks.withType(Upload) { +// repositories { +// mavenDeployer { +// if (project.hasProperty('release')) { +// repository(url: uri("https://gradle.artifactoryonline.com/gradle/libs-releases-local")) { +// authentication(userName: artifactoryUserName, password: artifactoryPassword) +// } +// } else { +// repository(url: uri("$rootProject.buildDir/repo")) +// } +// } +// } +// } } dependencies { + compile module('org.codehaus.groovy:groovy:1.8.6') { + dependency 'asm:objectweb-asm/asm-all:3.3.1' + dependency 'antlr:antlr:2.7.7' + dependency 'commons-cli:commons-cli:1.2' + } testCompile 'org.codehaus.groovy:groovy:1.8.7' } @@ -208,7 +215,7 @@ jni } -def deployer = uploadJni.repositories.mavenDeployer +//def deployer = uploadJni.repositories.mavenDeployer variants.each { variant, libs -> def variantName = GUtil.toCamelCase(variant) @@ -220,13 +227,13 @@ jni nativeJar runtime nativeJar } - def jniPom = deployer.addFilter(variant) { artifact, file -> - return file == nativeJar.archivePath - } - jniPom.groupId = project.group - jniPom.artifactId = nativeJar.baseName - jniPom.version = project.version - jniPom.scopeMappings.mappings.clear() +// def jniPom = deployer.addFilter(variant) { artifact, file -> +// return file == nativeJar.archivePath +// } +// jniPom.groupId = project.group +// jniPom.artifactId = nativeJar.baseName +// jniPom.version = project.version +// jniPom.scopeMappings.mappings.clear() } javadoc { @@ -250,21 +257,21 @@ archives javadocZip } -def mainPom = uploadArchives.repositories.mavenDeployer.pom -mainPom.groupId = project.group -mainPom.artifactId = jar.baseName -mainPom.version = project.version -mainPom.scopeMappings.mappings.clear() -mainPom.withXml { provider -> - def node = provider.asNode() - def deps = node.appendNode('dependencies') - ['osx-universal', 'linux-amd64', 'linux-i386', 'windows-amd64', 'windows-i386'].each { platform -> - def dep = deps.appendNode('dependency') - dep.appendNode('groupId', project.group) - dep.appendNode('artifactId', "native-platform-${platform}") - dep.appendNode('version', project.version) - } -} +//def mainPom = uploadArchives.repositories.mavenDeployer.pom +//mainPom.groupId = project.group +//mainPom.artifactId = jar.baseName +//mainPom.version = project.version +//mainPom.scopeMappings.mappings.clear() +//mainPom.withXml { provider -> +// def node = provider.asNode() +// def deps = node.appendNode('dependencies') +// ['osx-universal', 'linux-amd64', 'linux-i386', 'windows-amd64', 'windows-i386'].each { platform -> +// def dep = deps.appendNode('dependency') +// dep.appendNode('groupId', project.group) +// dep.appendNode('artifactId', "native-platform-${platform}") +// dep.appendNode('version', project.version) +// } +//} task wrapper(type: Wrapper) { gradleVersion = "1.3-20120907220018+0000" diff -Nru native-platform-0.3-rc-2/test-app/build.gradle native-platform-0.3-rc-2-gil/test-app/build.gradle --- native-platform-0.3-rc-2/test-app/build.gradle 2013-02-25 23:04:25.000000000 +0100 +++ native-platform-0.3-rc-2-gil/test-app/build.gradle 2013-04-30 10:30:02.228144718 +0200 @@ -6,7 +6,10 @@ if (project.hasProperty('release')) { repositories { - maven { url "$rootProject.buildDir/repo" } + ivy { + artifactPattern "/usr/share/java/[module]-[revision].[ext]" + artifactPattern "/usr/share/java/[module].[ext]" + } } dependencies { compile "net.rubygrapefruit:native-platform:${version}"