Prepare for release

kordamp · Nov 28, 2020 · 5be5458 · 5be5458
1 parent 3501bb9
commit 5be5458
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 39 deletions.
diff --git a/README.adoc b/README.adoc
@@ -4,7 +4,7 @@
 :project-repo:    maven
 :project-name:    bootstrapfx
 :project-group:   org.kordamp.bootstrapfx
-:project-version: 0.3.0
+:project-version: 0.4.0
 
 image:https://github.com/{project-owner}/{project-name}/workflows/Build/badge.svg["Build Status", link="https://github.com/{project-owner}/{project-name}/actions"]
 image:https://api.bintray.com/packages/{project-owner}/{project-repo}/{project-name}-core/images/download.svg[link="https://bintray.com/{project-owner}/{project-repo}/{project-name}-core/_latestVersion"]
@@ -60,6 +60,7 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
+import org.kordamp.bootstrapfx.BootstrapFX;
 import org.kordamp.bootstrapfx.scene.layout.Panel;
 
 public class Sampler extends Application {
@@ -75,7 +76,7 @@ public class Sampler extends Application {
         panel.setBody(content);
 
         Scene scene = new Scene(panel);
-        scene.getStylesheets().add("org/kordamp/bootstrapfx/bootstrapfx.css"); //<3>
+        scene.getStylesheets().add(BootstrapFX.bootstrapFXStylesheet());       //<3>
 
         primaryStage.setTitle("BootstrapFX");
         primaryStage.setScene(scene);
@@ -222,6 +223,11 @@ image::images/splitmenu-buttons.png[]
 
 == Changelog
 
+.0.4.0
+
+ * Full modular build.
+ * JDK 11 is now the minimum requirement.
+
 .0.3.0
 
  * The build was updated to use a different SASS plugin.

diff --git a/gradle.properties b/gradle.properties
@@ -22,14 +22,14 @@
 # THE SOFTWARE.
 #
 
-version                 = 0.4.0-SNAPSHOT
+version                 = 0.4.0
 group                   = org.kordamp.bootstrapfx
 sourceCompatibility     = 11
 targetCompatibility     = 11
 javafxVersion           = 11
 
-kordampPluginVersion    = 0.41.0
-kordampBuildVersion     = 2.0.0
+kordampPluginVersion    = 0.42.0
+kordampBuildVersion     = 2.1.0
 osPluginVersion         = 1.6.2
 freefairPluginVersion   = 5.3.0
 modularityPluginVersion = 1.7.0

diff --git a/settings.gradle b/settings.gradle
@@ -49,33 +49,3 @@ buildscript {
 apply plugin: 'org.kordamp.gradle.kordamp-parentbuild'
 
 rootProject.name = 'bootstrapfx'
-
-enforce {
-    rule(enforcer.rules.EnforceBytecodeVersion) { r ->
-        r.enabled = false
-    }
-    // rule(enforcer.rules.ForceDependencies) { r ->
-    //     r.dependencies.addAll 'com.typesafe.play:twirl-api_2.12:1.3.15',
-    //         'commons-codec:commons-codec:1.10',
-    //         'org.apache.commons:commons-lang3:3.6',
-    //         'org.scala-lang:scala-library:2.12.6',
-    //         'org.scala-lang:scala-reflect:2.12.6',
-    //         'org.scala-lang.modules:scala-parser-combinators_2.12:1.1.1',
-    //         'com.fasterxml.jackson.core:jackson-core:2.8.11',
-    //         'com.fasterxml.jackson.core:jackson-annotations:2.8.11',
-    //         'com.fasterxml.jackson.core:jackson-databind:2.8.11.1',
-    //         'junit:junit:4.12',
-    //         'com.google.code.findbugs:jsr305:3.0.2',
-    //         'org.seleniumhq.selenium:selenium-api:3.5.3',
-    //         'org.seleniumhq.selenium:selenium-support:3.5.3',
-    //         'org.seleniumhq.selenium:selenium-remote-driver:3.5.3',
-    //         'com.google.guava:guava:23.0',
-    //         'com.typesafe.akka:akka-actor_2.12:2.5.17',
-    //         'com.typesafe.akka:akka-stream_2.12:2.5.17',
-    //         'com.typesafe:config:1.3.3',
-    //         'org.slf4j:slf4j-api:1.7.25',
-    //         'org.slf4j:jul-to-slf4j:1.7.25',
-    //         'org.bouncycastle:bcprov-jdk15on:1.60',
-    //         'org.jruby:jruby-complete:9.2.0.0'
-    // }
-}
diff --git a/subprojects/bootstrapfx-core/src/main/java/module-info.java b/subprojects/bootstrapfx-core/src/main/java/module-info.java
@@ -25,7 +25,7 @@
 /**
  * @author Andres Almiray
  */
-open module org.kordamp.bootstrapfx.core {
+module org.kordamp.bootstrapfx.core {
     exports org.kordamp.bootstrapfx;
     exports org.kordamp.bootstrapfx.scene.layout;
 

diff --git a/.../java/org/kordamp/bootstrapfx/Marker.java → .../org/kordamp/bootstrapfx/BootstrapFX.java b/.../java/org/kordamp/bootstrapfx/Marker.java → .../org/kordamp/bootstrapfx/BootstrapFX.java
@@ -26,8 +26,12 @@
 /**
  * @author Andres Almiray
  */
-public final class Marker {
-    private Marker() {
+public final class BootstrapFX {
+    private BootstrapFX() {
         // noop
     }
+
+    public static String bootstrapFXStylesheet() {
+        return BootstrapFX.class.getResource("bootstrapfx.css").toExternalForm();
+    }
 }
diff --git a/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/Sampler.java b/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/Sampler.java
@@ -26,14 +26,15 @@
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import org.kordamp.bootstrapfx.BootstrapFX;
 
 public class Sampler extends Application {
     @Override
     public void start(Stage stage) throws Exception {
         Scene scene = new Scene(new DemoTabPane());
 
         scene.getStylesheets().addAll(
-            "org/kordamp/bootstrapfx/bootstrapfx.css",
+            BootstrapFX.bootstrapFXStylesheet(),
             "org/kordamp/bootstrapfx/sampler/sampler.css",
             "org/kordamp/bootstrapfx/sampler/xml-highlighting.css");