Merge griffon-core-java8 into griffon-core

griffon · Mar 15, 2018 · 99a13fc · 99a13fc
1 parent ac5c988
commit 99a13fc
Show file tree

Hide file tree

Showing 31 changed files with 21 additions and 519 deletions.
diff --git a/docs/griffon-guide/griffon-guide.gradle b/docs/griffon-guide/griffon-guide.gradle
@@ -33,7 +33,6 @@ apply plugin: 'com.bmuschko.java2html'
 ext.childProjects = [
     ':griffon-core',
     ':griffon-core-compile',
-    ':griffon-core-java8',
     ':griffon-core-test',
     ':griffon-groovy',
     ':griffon-groovy-compile',

diff --git a/docs/griffon-site/src/jbake/content/news/griffon_2.15.0.adoc b/docs/griffon-site/src/jbake/content/news/griffon_2.15.0.adoc
@@ -14,6 +14,7 @@ The Griffon team is happy to announce the release of Griffon 2.15.0!
 
 The following list summarizes the changes brought by this release:
 
+ * Java8 support has been merged into `griffon-core`, no additional artifacts are needed.
 
 A more detailed description of the changes and compatibility issues can be found at the link:/releasenotes/griffon_2.15.0.html[release notes, window="_blank"].
 

diff --git a/docs/griffon-site/src/jbake/content/releasenotes/griffon_2.15.0.adoc b/docs/griffon-site/src/jbake/content/releasenotes/griffon_2.15.0.adoc
@@ -20,6 +20,11 @@ The following dependencies have been upgraded
 
 === Runtime
 
+==== Java8 Support
+
+Previous versions provided Java8 specific support in an artifact named `griffon-core-java8`. This
+behavior is now found in `griffon-core`` there's no need for an additional artifact.
+
 === Buildtime
 
 === Compatibility

diff --git a/settings.gradle b/settings.gradle
@@ -18,7 +18,6 @@ def includeProject = { String projectDirName, String projectName ->
 rootProject.name = 'griffon'
 
 includeProject 'subprojects', 'griffon-core'
-includeProject 'subprojects', 'griffon-core-java8'
 includeProject 'subprojects', 'griffon-core-compile'
 includeProject 'subprojects', 'griffon-core-test'
 includeProject 'subprojects', 'griffon-guice'

diff --git a/subprojects/application-master-pom/src/pom/master-pom.xml b/subprojects/application-master-pom/src/pom/master-pom.xml
@@ -112,12 +112,6 @@
                 <version>${griffon.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.codehaus.griffon</groupId>
-                <artifactId>griffon-core-java8</artifactId>
-                <version>${griffon.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.codehaus.griffon</groupId>
                 <artifactId>griffon-core-compile</artifactId>

diff --git a/...ts/gradle-griffon-plugin/src/main/groovy/org/codehaus/griffon/gradle/GriffonPlugin.groovy b/...ts/gradle-griffon-plugin/src/main/groovy/org/codehaus/griffon/gradle/GriffonPlugin.groovy
@@ -183,9 +183,6 @@ class GriffonPlugin implements Plugin<Project> {
                 appendDependency('core')
                 appendDependency('core-compile')
                 appendDependency('core-test')
-                if (JavaVersion.current().isJava8Compatible()) {
-                    appendDependency('core-java8')
-                }
 
                 validateToolkit(project, extension)
                 if (extension.applicationProject) {

diff --git a/subprojects/griffon-core-java8/gradle.properties b/subprojects/griffon-core-java8/gradle.properties
diff --git a/subprojects/griffon-core-java8/griffon-core-java8.gradle b/subprojects/griffon-core-java8/griffon-core-java8.gradle
diff --git a/subprojects/griffon-core-java8/src/main/java/griffon/core/editors/package-info.java b/subprojects/griffon-core-java8/src/main/java/griffon/core/editors/package-info.java
diff --git a/subprojects/griffon-core-java8/src/main/java/griffon/core/formatters/package-info.java b/subprojects/griffon-core-java8/src/main/java/griffon/core/formatters/package-info.java
diff --git a/.../griffon-core-java8/src/test/groovy/griffon/core/editors/PropertyEditorSpecSupport.groovy b/.../griffon-core-java8/src/test/groovy/griffon/core/editors/PropertyEditorSpecSupport.groovy
diff --git a/...ts/griffon-core-java8/src/test/groovy/griffon/core/formatters/FormatterSpecSupport.groovy b/...ts/griffon-core-java8/src/test/groovy/griffon/core/formatters/FormatterSpecSupport.groovy
diff --git a/.../griffon-core-java8/src/test/groovy/griffon/core/formatters/LocalDateFormatterSpec.groovy b/.../griffon-core-java8/src/test/groovy/griffon/core/formatters/LocalDateFormatterSpec.groovy