Skip to content

Modularize project #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
IceBlizz6 wants to merge 3 commits into from
Closed

Modularize project #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c25bf0c
Moduled
IceBlizz6 Apr 19, 2020
2c5013f
Travis jdk9
IceBlizz6 Apr 19, 2020
6ed93da
Travis jdk11
IceBlizz6 Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: java
dist: trusty
jdk:
- oraclejdk8
- oraclejdk11
script:
- sh travis-build.sh
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ plugins {
id 'io.franzbecker.gradle-lombok' version '3.2.0' apply false
id "com.jfrog.artifactory" version "4.11.0" apply false
id "biz.aQute.bnd.builder" version "5.0.0" apply false
id "org.javamodularity.moduleplugin" version "1.5.0" apply false
}

subprojects {
Expand All @@ -46,6 +47,7 @@ subprojects {
apply plugin: "com.jfrog.bintray"
apply plugin: 'io.franzbecker.gradle-lombok'
apply plugin: 'com.jfrog.artifactory'
apply plugin: 'org.javamodularity.moduleplugin'

repositories {
mavenLocal()
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PROJECT_DEV_NAME = Andrew Potter
LIB_GRAPHQL_JAVA_VER = 14.0
LIB_JACKSON_VER = 2.10.0

SOURCE_COMPATIBILITY = 1.8
TARGET_COMPATIBILITY = 1.8
SOURCE_COMPATIBILITY = 9
TARGET_COMPATIBILITY = 9

GRADLE_WRAPPER_VER = 6.0.1
25 changes: 25 additions & 0 deletions graphql-java-kickstart/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module graphql.kickstart.execution {
requires lombok;
requires graphql.java;
requires com.fasterxml.jackson.annotation;
requires com.fasterxml.jackson.databind;
requires com.fasterxml.jackson.datatype.jdk8;

exports graphql.kickstart.execution;
exports graphql.kickstart.execution.config;
exports graphql.kickstart.execution.context;
exports graphql.kickstart.execution.error;
exports graphql.kickstart.execution.input;
exports graphql.kickstart.execution.instrumentation;
exports graphql.kickstart.execution.subscriptions;
exports graphql.kickstart.execution.subscriptions.apollo;

opens graphql.kickstart.execution;
opens graphql.kickstart.execution.config;
opens graphql.kickstart.execution.context;
opens graphql.kickstart.execution.error;
opens graphql.kickstart.execution.input;
opens graphql.kickstart.execution.instrumentation;
opens graphql.kickstart.execution.subscriptions;
opens graphql.kickstart.execution.subscriptions.apollo;
}
2 changes: 1 addition & 1 deletion graphql-java-servlet/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Export-Package: graphql.kickstart.*
Export-Package: graphql.kickstart.servlet.*
Require-Capability: osgi.extender
23 changes: 23 additions & 0 deletions graphql-java-servlet/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module graphql.kickstart.servlet {
requires graphql.java;
requires lombok;
requires graphql.kickstart.execution;

exports graphql.kickstart.servlet;
exports graphql.kickstart.servlet.apollo;
exports graphql.kickstart.servlet.config;
exports graphql.kickstart.servlet.context;
exports graphql.kickstart.servlet.core;
exports graphql.kickstart.servlet.input;
exports graphql.kickstart.servlet.osgi;
exports graphql.kickstart.servlet.subscriptions;

opens graphql.kickstart.servlet;
opens graphql.kickstart.servlet.apollo;
opens graphql.kickstart.servlet.config;
opens graphql.kickstart.servlet.context;
opens graphql.kickstart.servlet.core;
opens graphql.kickstart.servlet.input;
opens graphql.kickstart.servlet.osgi;
opens graphql.kickstart.servlet.subscriptions;
}