From 952481eaee2cb5a0078a9a32e8bb5deae1323716 Mon Sep 17 00:00:00 2001 From: Josh Larson Date: Sun, 21 Jan 2018 12:56:40 -0600 Subject: [PATCH] Added gradle build support --- .gitignore | 5 +++++ build.gradle | 25 +++++++++++++++++++++++++ core/build.gradle | 20 ++++++-------------- fileupload/build.gradle | 15 +++++++++++++++ markdown-plugin/build.gradle | 11 +++++++++++ nanolets/build.gradle | 7 +++++++ samples/build.gradle | 10 ++++++++++ settings.gradle | 16 ++++++++++++++++ webserver/build.gradle | 11 +++++++++++ websocket/build.gradle | 11 +++++++++++ 10 files changed, 117 insertions(+), 14 deletions(-) create mode 100644 build.gradle create mode 100644 fileupload/build.gradle create mode 100644 markdown-plugin/build.gradle create mode 100644 nanolets/build.gradle create mode 100644 samples/build.gradle create mode 100644 settings.gradle create mode 100644 webserver/build.gradle create mode 100644 websocket/build.gradle diff --git a/.gitignore b/.gitignore index dcc91d9..1cfbc8d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,12 +3,17 @@ build target *.iml +*.ipr +*.iws *.class .idea .classpath .project .gradle +gradle/ +gradlew +gradlew.bat # Vim Backup/Swap Files *~ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..382fd6a --- /dev/null +++ b/build.gradle @@ -0,0 +1,25 @@ +allprojects { + apply plugin: 'java' + apply plugin: 'idea' + + group = 'org.nanohttpd' + version = '2.3.2-SNAPSHOT' +} + +subprojects { + apply plugin: 'java' + sourceCompatibility = 1.7 + targetCompatibility = 1.7 + + repositories { + jcenter() + } + + dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' + } +} + +task wrapper(type: Wrapper) { + gradleVersion = "4.4.1" +} diff --git a/core/build.gradle b/core/build.gradle index cf42871..81d9248 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,18 +1,10 @@ -apply plugin: 'java' - -version = '2.1.0' - -jar { - baseName = 'nanohttpd' -} - -repositories { - mavenCentral() -} +description = 'NanoHttpd-Core' dependencies { - testCompile group: 'junit', name: 'junit', version: '4.8.2' - testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.2.5' - testCompile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.2.5' + testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.2.5' + testCompile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.2.5' } +task wrapper(type: Wrapper) { + gradleVersion = "4.4.1" +} diff --git a/fileupload/build.gradle b/fileupload/build.gradle new file mode 100644 index 0000000..21cf4e5 --- /dev/null +++ b/fileupload/build.gradle @@ -0,0 +1,15 @@ +description = 'NanoHttpd-apache file upload integration' + +dependencies { + compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1' + + compileOnly project(':nanohttpd') + compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.5' + + testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.4.1' + testCompile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.4.1' +} + +task wrapper(type: Wrapper) { + gradleVersion = "4.4.1" +} diff --git a/markdown-plugin/build.gradle b/markdown-plugin/build.gradle new file mode 100644 index 0000000..873efc5 --- /dev/null +++ b/markdown-plugin/build.gradle @@ -0,0 +1,11 @@ +description = 'NanoHttpd-Webserver-Markdown-Plugin' + +dependencies { + compile group: 'org.pegdown', name: 'pegdown', version: '1.4.1' + compileOnly project(':nanohttpd') + compileOnly project(':nanohttpd-webserver') +} + +task wrapper(type: Wrapper) { + gradleVersion = "4.4.1" +} diff --git a/nanolets/build.gradle b/nanolets/build.gradle new file mode 100644 index 0000000..1d8b816 --- /dev/null +++ b/nanolets/build.gradle @@ -0,0 +1,7 @@ +description = 'NanoHttpd-nano application server' + +dependencies { + compile project(':nanohttpd') + + testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.4.1' +} diff --git a/samples/build.gradle b/samples/build.gradle new file mode 100644 index 0000000..9143408 --- /dev/null +++ b/samples/build.gradle @@ -0,0 +1,10 @@ +description = 'NanoHttpd-Samples' + +dependencies { + compile project(':nanohttpd') + compile project(':nanohttpd-webserver') +} + +task wrapper(type: Wrapper) { + gradleVersion = "4.4.1" +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ac7d1ae --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +rootProject.name = 'nanohttpd-project' +include ':nanohttpd' +include ':nanohttpd-samples' +include ':nanohttpd-webserver' +include ':nanohttpd-websocket' +include ':nanohttpd-webserver-markdown-plugin' +include ':nanohttpd-nanolets' +include ':nanohttpd-apache-fileupload' + +project(':nanohttpd').projectDir = "$rootDir/core" as File +project(':nanohttpd-samples').projectDir = "$rootDir/samples" as File +project(':nanohttpd-webserver').projectDir = "$rootDir/webserver" as File +project(':nanohttpd-websocket').projectDir = "$rootDir/websocket" as File +project(':nanohttpd-webserver-markdown-plugin').projectDir = "$rootDir/markdown-plugin" as File +project(':nanohttpd-nanolets').projectDir = "$rootDir/nanolets" as File +project(':nanohttpd-apache-fileupload').projectDir = "$rootDir/fileupload" as File \ No newline at end of file diff --git a/webserver/build.gradle b/webserver/build.gradle new file mode 100644 index 0000000..06d4b27 --- /dev/null +++ b/webserver/build.gradle @@ -0,0 +1,11 @@ +description = 'NanoHttpd-Webserver' + +dependencies { + compile project(':nanohttpd') + + testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.4.1' +} + +task wrapper(type: Wrapper) { + gradleVersion = "4.4.1" +} diff --git a/websocket/build.gradle b/websocket/build.gradle new file mode 100644 index 0000000..45bb2ec --- /dev/null +++ b/websocket/build.gradle @@ -0,0 +1,11 @@ +description = 'NanoHttpd-Websocket' + +dependencies { + compile project(':nanohttpd') + testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5' + testCompile group: 'org.eclipse.jetty.websocket', name: 'websocket-client', version: '9.3.0.M2' +} + +task wrapper(type: Wrapper) { + gradleVersion = "4.4.1" +}