Updated google module to use module-info.java, updated dependencies.

dlsc-software-consulting-gmbh · Sep 15, 2018 · c431999 · c431999
1 parent 4bf828e
commit c431999
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 20 deletions.
diff --git 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
@@ -34,8 +34,14 @@
     <dependencies>
         <dependency>
             <groupId>org.openjfx</groupId>
-            <artifactId>javafx.web</artifactId>
-            <version>11.0.0-SNAPSHOT</version>
+            <artifactId>javafx-controls</artifactId>
+            <version>11-ea+25</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-web</artifactId>
+            <version>11-ea+25</version>
         </dependency>
 
         <dependency>
@@ -48,7 +54,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.24</version>
+            <version>1.8.0-beta2</version>
         </dependency>
 
         <dependency>
@@ -72,19 +78,19 @@
         <dependency>
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client-jackson2</artifactId>
-            <version>1.22.0</version>
+            <version>1.25.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-calendar</artifactId>
-            <version>v3-rev236-1.22.0</version>
+            <version>v3-rev342-1.25.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-oauth2</artifactId>
-            <version>v2-rev124-1.22.0</version>
+            <version>v2-rev141-1.25.0</version>
         </dependency>
 
         <dependency>
@@ -93,12 +99,6 @@
             <version>0.16</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>r05</version>
-        </dependency>
-
 
     </dependencies>
 

diff --git 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
@@ -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;
+}
diff --git a/CalendarFXView/pom.xml b/CalendarFXView/pom.xml
@@ -52,6 +52,12 @@
             <version>11-ea+25</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>11-ea+25</version>
+        </dependency>
+
         <dependency>
             <groupId>com.calendarfx</groupId>
             <artifactId>recurrence</artifactId>
@@ -61,7 +67,7 @@
         <dependency>
             <groupId>org.controlsfx</groupId>
             <artifactId>controlsfx</artifactId>
-            <version>9.0.0</version>
+            <version>9.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git 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
@@ -43,7 +43,7 @@
         <module>CalendarFXSampler</module>
         <module>CalendarFXView</module>
         <module>CalendarFXExperimental</module>
-        <!-- module>CalendarFXGoogle</module -->
+        <module>CalendarFXGoogle</module>
         <module>CalendarFXApp</module>
         <module>CalendarFXiCal</module>
         <module>CalendarFXWeather</module>