ZEST-188 Remove remains of scala support
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/496b8b10 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/496b8b10 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/496b8b10 Branch: refs/heads/develop Commit: 496b8b1072d8946143f46d8b4f62cf4e6663c219 Parents: ce178a3 Author: Paul Merlin <[email protected]> Authored: Sat Nov 19 11:54:04 2016 +0100 Committer: Paul Merlin <[email protected]> Committed: Sat Nov 19 11:54:04 2016 +0100 ---------------------------------------------------------------------- .../main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy | 1 - .../apache/zest/gradle/dependencies/DependenciesPlugin.groovy | 4 ---- .../org/apache/zest/gradle/dist/GoOfflineHelpersTasks.groovy | 2 +- .../java/org/apache/zest/runtime/composite/CompositeModel.java | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/496b8b10/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy index 4517534..ed2d941 100644 --- a/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/CodeProjectsPlugin.groovy @@ -35,7 +35,6 @@ class CodeProjectsPlugin implements Plugin<Project> static boolean isCodeProject( Project project ) { [ 'src/main/java', 'src/test/java', - 'src/main/scala', 'src/test/scala', 'src/main/groovy', 'src/test/groovy' ].collect { path -> new File( "$project.projectDir/$path" ) }.any { dir -> dir.isDirectory() } http://git-wip-us.apache.org/repos/asf/zest-java/blob/496b8b10/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesPlugin.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesPlugin.groovy index 6ced34d..3a7f31b 100644 --- a/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/dependencies/DependenciesPlugin.groovy @@ -76,7 +76,6 @@ class DependenciesPlugin implements Plugin<Project> static final def restletVersion = '2.3.7' static final def rdfVersion = '2.7.16' // 2.8.x change query results!! 4.x exists static final def riakVersion = '2.0.8' - static final def scalaVersion = '2.11.8' static final def servletVersion = '3.1.0' static final def shiroVersion = '1.3.2' static final def skedVersion = '2.1' @@ -126,9 +125,6 @@ class DependenciesPlugin implements Plugin<Project> "org.restlet.jee:org.restlet.ext.servlet:$restletVersion", "org.restlet.jee:org.restlet.ext.slf4j:$restletVersion" ], - // Scala - scala : "org.scala-lang:scala-library:$scalaVersion", - // Spring spring_core : [ "org.springframework:spring-beans:$springVersion", "org.springframework:spring-context:$springVersion" ], http://git-wip-us.apache.org/repos/asf/zest-java/blob/496b8b10/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/GoOfflineHelpersTasks.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/GoOfflineHelpersTasks.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/GoOfflineHelpersTasks.groovy index 459eaaf..8ff7540 100644 --- a/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/GoOfflineHelpersTasks.groovy +++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/dist/GoOfflineHelpersTasks.groovy @@ -322,7 +322,7 @@ task download( type: Copy ) { def header switch( flavour ) { - case 'java': case 'groovy': case 'scala': case 'js': + case 'java': case 'groovy': case 'js': header = licenseHeader_wrap( base, '/*', ' * ', ' */' ); break case 'xml': case 'html': header = licenseHeader_wrap( base, '<!--', ' ', '-->' ); break http://git-wip-us.apache.org/repos/asf/zest-java/blob/496b8b10/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java index 45cc332..c872ff7 100644 --- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java +++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java @@ -81,7 +81,6 @@ public abstract class CompositeModel // Create proxy class createProxyClass(); primaryType = mixinTypes() - .filter( type -> !type.getName().equals( "scala.ScalaObject" ) ) .reduce( null, ( primary, type ) -> { if( primary == null )
