From c431999c1e747fcd48e1d0297dbebe4fe3500963 Mon Sep 17 00:00:00 2001 From: Dirk Lemmermann Date: Sat, 15 Sep 2018 17:08:07 +0200 Subject: [PATCH] Updated google module to use module-info.java, updated dependencies. --- CalendarFXApp/src/main/java/module-info.java | 3 +-- CalendarFXGoogle/pom.xml | 24 +++++++++---------- .../calendarfx/google/GoogleCalendarApp.java | 5 +--- .../src/main/java/module-info.java | 21 ++++++++++++++++ CalendarFXView/pom.xml | 8 ++++++- CalendarFXView/src/main/java/module-info.java | 1 + pom.xml | 2 +- 7 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 CalendarFXGoogle/src/main/java/module-info.java diff --git a/CalendarFXApp/src/main/java/module-info.java b/CalendarFXApp/src/main/java/module-info.java index c9991c97..08facec3 100644 --- a/CalendarFXApp/src/main/java/module-info.java +++ b/CalendarFXApp/src/main/java/module-info.java @@ -1,7 +1,6 @@ module com.calendarfx.app { - requires javafx.base; - requires javafx.graphics; + requires javafx.controls; requires com.calendarfx.view; exports com.calendarfx.app; diff --git a/CalendarFXGoogle/pom.xml b/CalendarFXGoogle/pom.xml index 206734c6..fbdf1706 100644 --- a/CalendarFXGoogle/pom.xml +++ b/CalendarFXGoogle/pom.xml @@ -34,8 +34,14 @@ org.openjfx - javafx.web - 11.0.0-SNAPSHOT + javafx-controls + 11-ea+25 + + + + org.openjfx + javafx-web + 11-ea+25 @@ -48,7 +54,7 @@ org.slf4j slf4j-simple - 1.7.24 + 1.8.0-beta2 @@ -72,19 +78,19 @@ com.google.api-client google-api-client-jackson2 - 1.22.0 + 1.25.0 com.google.apis google-api-services-calendar - v3-rev236-1.22.0 + v3-rev342-1.25.0 com.google.apis google-api-services-oauth2 - v2-rev124-1.22.0 + v2-rev141-1.25.0 @@ -93,12 +99,6 @@ 0.16 - - com.google.guava - guava - r05 - - diff --git a/CalendarFXGoogle/src/main/java/com/calendarfx/google/GoogleCalendarApp.java b/CalendarFXGoogle/src/main/java/com/calendarfx/google/GoogleCalendarApp.java index 218867b3..9addbc36 100644 --- a/CalendarFXGoogle/src/main/java/com/calendarfx/google/GoogleCalendarApp.java +++ b/CalendarFXGoogle/src/main/java/com/calendarfx/google/GoogleCalendarApp.java @@ -17,7 +17,6 @@ package com.calendarfx.google; import com.calendarfx.google.view.GoogleCalendarAppView; -import com.calendarfx.util.LoggingDomain; import com.calendarfx.view.CalendarView; import javafx.application.Application; import javafx.scene.Scene; @@ -29,9 +28,7 @@ public class GoogleCalendarApp extends Application { @Override - public void start(Stage primaryStage) throws Exception { - LoggingDomain.CONFIG.info("Java version: " + System.getProperty("java.version")); - + public void start(Stage primaryStage) { CalendarView calendarView = new CalendarView(); calendarView.setToday(LocalDate.now()); calendarView.setTime(LocalTime.now()); diff --git a/CalendarFXGoogle/src/main/java/module-info.java b/CalendarFXGoogle/src/main/java/module-info.java new file mode 100644 index 00000000..04de39c2 --- /dev/null +++ b/CalendarFXGoogle/src/main/java/module-info.java @@ -0,0 +1,21 @@ +module com.calendarfx.google { + + requires com.calendarfx.view; + requires javafx.base; + requires google.api.services.calendar.v3.rev342; + requires javafx.graphics; + requires de.jensd.fx.glyphs.fontawesome; + requires guava.jdk5; + requires controlsfx; + requires google.http.client; + requires javafx.controls; + requires javafx.web; + requires google.api.services.oauth2.v2.rev141; + requires google.oauth.client; + requires google.api.client; + requires google.http.client.jackson2; + requires geocoder.java; + requires GMapsFX; + + exports com.calendarfx.google; +} \ No newline at end of file diff --git a/CalendarFXView/pom.xml b/CalendarFXView/pom.xml index 7413d165..c9806991 100644 --- a/CalendarFXView/pom.xml +++ b/CalendarFXView/pom.xml @@ -52,6 +52,12 @@ 11-ea+25 + + org.openjfx + javafx-fxml + 11-ea+25 + + com.calendarfx recurrence @@ -61,7 +67,7 @@ org.controlsfx controlsfx - 9.0.0 + 9.0.1-SNAPSHOT diff --git a/CalendarFXView/src/main/java/module-info.java b/CalendarFXView/src/main/java/module-info.java index 5c2b7995..c78f5e2d 100644 --- a/CalendarFXView/src/main/java/module-info.java +++ b/CalendarFXView/src/main/java/module-info.java @@ -2,6 +2,7 @@ requires controlsfx; requires javafx.controls; + requires javafx.fxml; requires java.logging; requires de.jensd.fx.glyphs.fontawesome; requires joda.time; diff --git a/pom.xml b/pom.xml index a2e4adb4..9d172d2c 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ CalendarFXSampler CalendarFXView CalendarFXExperimental - + CalendarFXGoogle CalendarFXApp CalendarFXiCal CalendarFXWeather