Skip to content

Commit 59a0ac4

Browse files
authored
Do not build scala docs as javadocs for scala 2.10 (#1394)
#1368 introduces a plugin that is documents scala apis for java developers. This plugin does not support 2.10 and this variant was missed in the initial testing. This commit for 7.x conditionally uses this plugin based on the scala major version. 2.10 support has been removed for 8.x.
1 parent c22b921 commit 59a0ac4

File tree

2 files changed

+28
-16
lines changed

2 files changed

+28
-16
lines changed

spark/sql-13/build.gradle

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ variants {
1515
configurations {
1616
scalaCompilerPlugin {
1717
defaultDependencies { dependencies ->
18-
dependencies.add(project.dependencies.create( "com.typesafe.genjavadoc:genjavadoc-plugin_${scalaVersion}:0.13"))
18+
if (project.ext.scalaMajorVersion != '2.10') {
19+
dependencies.add(project.dependencies.create("com.typesafe.genjavadoc:genjavadoc-plugin_${scalaVersion}:0.13"))
20+
}
1921
}
2022
}
2123
}
@@ -119,9 +121,11 @@ jar {
119121
}
120122

121123
javadoc {
122-
dependsOn compileScala
124+
if (project.ext.scalaMajorVersion != '2.10') {
125+
dependsOn compileScala
126+
source += "$buildDir/generated/java"
127+
}
123128
source += project(":elasticsearch-hadoop-mr").sourceSets.main.allJava
124-
source += "$buildDir/generated/java"
125129
classpath += files(project(":elasticsearch-hadoop-mr").sourceSets.main.compileClasspath)
126130
}
127131

@@ -149,10 +153,12 @@ configurations.all { Configuration conf ->
149153
}
150154

151155
tasks.withType(ScalaCompile) {
152-
scalaCompileOptions.with {
153-
additionalParameters = [
154-
"-Xplugin:" + configurations.scalaCompilerPlugin.asPath,
155-
"-P:genjavadoc:out=$buildDir/generated/java".toString()
156-
]
156+
if (project.ext.scalaMajorVersion != '2.10') {
157+
scalaCompileOptions.with {
158+
additionalParameters = [
159+
"-Xplugin:" + configurations.scalaCompilerPlugin.asPath,
160+
"-P:genjavadoc:out=$buildDir/generated/java".toString()
161+
]
162+
}
157163
}
158164
}

spark/sql-20/build.gradle

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ variants {
1515
configurations {
1616
scalaCompilerPlugin {
1717
defaultDependencies { dependencies ->
18-
dependencies.add(project.dependencies.create( "com.typesafe.genjavadoc:genjavadoc-plugin_${scalaVersion}:0.13"))
18+
if (project.ext.scalaMajorVersion != '2.10') {
19+
dependencies.add(project.dependencies.create("com.typesafe.genjavadoc:genjavadoc-plugin_${scalaVersion}:0.13"))
20+
}
1921
}
2022
}
2123
}
@@ -132,9 +134,11 @@ jar {
132134
}
133135

134136
javadoc {
135-
dependsOn compileScala
137+
if (project.ext.scalaMajorVersion != '2.10') {
138+
dependsOn compileScala
139+
source += "$buildDir/generated/java"
140+
}
136141
source += project(":elasticsearch-hadoop-mr").sourceSets.main.allJava
137-
source += "$buildDir/generated/java"
138142
classpath += files(project(":elasticsearch-hadoop-mr").sourceSets.main.compileClasspath)
139143
}
140144

@@ -147,10 +151,12 @@ scaladoc {
147151
}
148152

149153
tasks.withType(ScalaCompile) {
150-
scalaCompileOptions.with {
151-
additionalParameters = [
152-
"-Xplugin:" + configurations.scalaCompilerPlugin.asPath,
153-
"-P:genjavadoc:out=$buildDir/generated/java".toString()
154-
]
154+
if (project.ext.scalaMajorVersion != '2.10') {
155+
scalaCompileOptions.with {
156+
additionalParameters = [
157+
"-Xplugin:" + configurations.scalaCompilerPlugin.asPath,
158+
"-P:genjavadoc:out=$buildDir/generated/java".toString()
159+
]
160+
}
155161
}
156162
}

0 commit comments

Comments
 (0)