From 17c76c859bb8b8b490749101c2654144f48836f1 Mon Sep 17 00:00:00 2001 From: Erik De Rijcke Date: Tue, 10 Feb 2015 22:20:37 +0100 Subject: migrate to maven --- build.gradle | 51 -------------------------------------------------- examples/build.gradle | 33 -------------------------------- examples/pom.xml | 17 +++++++++++++++++ generator/build.gradle | 9 --------- generator/pom.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 17 +++++++++++++++++ settings.gradle | 3 --- stubs/build.gradle | 23 ----------------------- stubs/pom.xml | 28 +++++++++++++++++++++++++++ wayland/build.gradle | 34 --------------------------------- wayland/pom.xml | 28 +++++++++++++++++++++++++++ 11 files changed, 137 insertions(+), 153 deletions(-) delete mode 100644 build.gradle delete mode 100644 examples/build.gradle create mode 100644 examples/pom.xml delete mode 100644 generator/build.gradle create mode 100644 generator/pom.xml create mode 100644 pom.xml delete mode 100644 settings.gradle delete mode 100644 stubs/build.gradle create mode 100644 stubs/pom.xml delete mode 100644 wayland/build.gradle create mode 100644 wayland/pom.xml diff --git a/build.gradle b/build.gradle deleted file mode 100644 index ecb37a2..0000000 --- a/build.gradle +++ /dev/null @@ -1,51 +0,0 @@ -if (JavaVersion.current().isJava8Compatible()) { - allprojects { - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } - } -} - -allprojects { - apply plugin: 'java' - apply plugin: 'maven' - - sourceCompatibility = JavaVersion.VERSION_1_6 - - group = 'org.freedesktop' - version = '1.1.0' - - repositories { - mavenCentral() - } -} - -def exportedProjects = [ - ":stubs", - ":wayland", -] - -task alljavadoc(type: Javadoc) { - source exportedProjects.collect { project(it).sourceSets.main.allJava } - classpath = files(exportedProjects.collect { project(it).sourceSets.main.compileClasspath }) - destinationDir = file("${buildDir}/docs/javadoc") -} - -alljavadoc.dependsOn(":wayland:compileJava") - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives jar - - archives sourcesJar - archives javadocJar -} diff --git a/examples/build.gradle b/examples/build.gradle deleted file mode 100644 index f5348f8..0000000 --- a/examples/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -//Copyright 2015 Erik De Rijcke -// -//Licensed under the Apache License,Version2.0(the"License"); -//you may not use this file except in compliance with the License. -//You may obtain a copy of the License at -// -//http://www.apache.org/licenses/LICENSE-2.0 -// -//Unless required by applicable law or agreed to in writing,software -//distributed under the License is distributed on an"AS IS"BASIS, -//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,either express or implied. -//See the License for the specific language governing permissions and -//limitations under the License. -description = 'Examples for the Wayland protocol Java classes' - -apply plugin: 'java' -apply plugin: 'maven' - -sourceCompatibility = JavaVersion.VERSION_1_6 - -group = 'org.freedesktop' -version = '1.1.0-SNAPSHOT' - -repositories { - mavenLocal() - mavenCentral() -} - -dependencies { - compile( - 'org.freedesktop:wayland:1.1.0-SNAPSHOT' - ) -} \ No newline at end of file diff --git a/examples/pom.xml b/examples/pom.xml new file mode 100644 index 0000000..8dc8f2c --- /dev/null +++ b/examples/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + + org.freedesktop + examples + 1.0 + + + + + + + \ No newline at end of file diff --git a/generator/build.gradle b/generator/build.gradle deleted file mode 100644 index 4dcca42..0000000 --- a/generator/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -description = 'Lib for auto-generating Wayland protocol Java classes' - -dependencies { - compile('com.squareup:javawriter:2.5.0', - 'com.google.guava:guava:17.0', - project(":stubs") - ) -} - diff --git a/generator/pom.xml b/generator/pom.xml new file mode 100644 index 0000000..ec77fef --- /dev/null +++ b/generator/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + + + org.freedesktop + wayland-java-bindings + 1.1.0 + + + generator + + + + com.google.guava + guava + 18.0 + + + com.squareup + javawriter + 2.5.0 + + + ${project.groupId} + stubs + ${project.version} + + + + + + + + maven-compiler-plugin + + 1.6 + 1.6 + -proc:none + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..eafcf06 --- /dev/null +++ b/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + org.freedesktop + wayland-java-bindings + 1.1.0 + pom + + + stubs + generator + wayland + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 8cc3a48..0000000 --- a/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -include 'stubs', 'generator', 'wayland' - - diff --git a/stubs/build.gradle b/stubs/build.gradle deleted file mode 100644 index 0ade098..0000000 --- a/stubs/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -//Copyright 2015 Erik De Rijcke -// -//Licensed under the Apache License,Version2.0(the"License"); -//you may not use this file except in compliance with the License. -//You may obtain a copy of the License at -// -//http://www.apache.org/licenses/LICENSE-2.0 -// -//Unless required by applicable law or agreed to in writing,software -//distributed under the License is distributed on an"AS IS"BASIS, -//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,either express or implied. -//See the License for the specific language governing permissions and -//limitations under the License. -description = 'Java stub for wayland client and server protocols.' - -dependencies { - testCompile group: 'junit', name: 'junit', version: '4.+' - compile( - 'com.google.code.findbugs:jsr305:3.0.0', - 'net.java.dev.jna:jna:4.1.0' - ) -} - diff --git a/stubs/pom.xml b/stubs/pom.xml new file mode 100644 index 0000000..216442d --- /dev/null +++ b/stubs/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + + org.freedesktop + wayland-java-bindings + 1.1.0 + + + stubs + + + + com.google.code.findbugs + jsr305 + 3.0.0 + + + net.java.dev.jna + jna + 4.1.0 + + + + \ No newline at end of file diff --git a/wayland/build.gradle b/wayland/build.gradle deleted file mode 100644 index e92d508..0000000 --- a/wayland/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -description = 'Auto-generated Wayland protocol Java classes' - -def generatedSources = "$buildDir/generated-src" -def generatedOutputDir = file("$generatedSources") - -compileJava { - doFirst { - generatedOutputDir.exists() || generatedOutputDir.mkdirs() - options.compilerArgs = [ - '-s', "${generatedSources}" - ] - } -} - -sourceSets { - main { - java { - srcDirs += generatedOutputDir - } - } -} - -javadoc { - source = sourceSets.main.resources -} - -dependencies { - compile( - project(":stubs"), - project(":generator") - ) -} - -compileJava.dependsOn clean \ No newline at end of file diff --git a/wayland/pom.xml b/wayland/pom.xml new file mode 100644 index 0000000..2775234 --- /dev/null +++ b/wayland/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + + org.freedesktop + wayland-java-bindings + 1.1.0 + + + wayland + + + + ${project.groupId} + stubs + ${project.version} + + + ${project.groupId} + generator + ${project.version} + provided + + + \ No newline at end of file -- cgit v1.2.3