You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/04/18 22:11:26 UTC
svn commit: r1888936 - in /poi/trunk: build.gradle poi-examples/
poi-excelant/ poi-integration/ poi-ooxml-full/ poi-ooxml-full/build.gradle
poi-ooxml-lite-agent/ poi-ooxml-lite/ poi-ooxml-lite/build.gradle
poi-ooxml/ poi-scratchpad/ poi/
Author: kiwiwings
Date: Sun Apr 18 22:11:26 2021
New Revision: 1888936
URL: http://svn.apache.org/viewvc?rev=1888936&view=rev
Log:
fix gradle builds to better comply with IntelliJ
Modified:
poi/trunk/build.gradle
poi/trunk/poi/ (props changed)
poi/trunk/poi-examples/ (props changed)
poi/trunk/poi-excelant/ (props changed)
poi/trunk/poi-integration/ (props changed)
poi/trunk/poi-ooxml/ (props changed)
poi/trunk/poi-ooxml-full/ (props changed)
poi/trunk/poi-ooxml-full/build.gradle
poi/trunk/poi-ooxml-lite/ (props changed)
poi/trunk/poi-ooxml-lite-agent/ (props changed)
poi/trunk/poi-ooxml-lite/build.gradle
poi/trunk/poi-scratchpad/ (props changed)
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1888936&r1=1888935&r2=1888936&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sun Apr 18 22:11:26 2021
@@ -59,6 +59,7 @@ ant.taskdef(name: "junit",
classname: "org.apache.tools.ant.taskdefs.optional.junitlauncher.confined.JUnitLauncherTask",
classpath: configurations.antLibs.asPath)
+
wrapper {
// https://stackoverflow.com/a/54741656/2066598
gradleVersion = '6.8'
@@ -79,8 +80,8 @@ wrapper.finalizedBy adjustWrapperPropert
Define properties for all projects, including this one
*/
allprojects {
- apply plugin: 'eclipse'
-// apply plugin: 'idea'
+// apply plugin: 'eclipse'
+ apply plugin: 'idea'
}
/**
@@ -133,6 +134,11 @@ subprojects {
testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
}
+ task wrapper(type: Wrapper){
+ // https://stackoverflow.com/a/65701523/2066598
+ gradleVersion = '6.8'
+ }
+
jar {
manifest {
attributes 'Implementation-Title': 'Apache POI', 'Implementation-Version': project.version
Propchange: poi/trunk/poi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
*.iml
build
+out
+gradle
+gradlew*
Propchange: poi/trunk/poi-examples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
*.iml
build
+out
+gradle
+gradlew*
Propchange: poi/trunk/poi-excelant/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
*.iml
build
+out
+gradle
+gradlew*
Propchange: poi/trunk/poi-integration/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
*.iml
build
+out
+gradle
+gradlew*
Propchange: poi/trunk/poi-ooxml/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
*.iml
build
+out
+gradle
+gradlew*
Propchange: poi/trunk/poi-ooxml-full/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
*.iml
build
+out
+gradle
+gradlew*
Modified: poi/trunk/poi-ooxml-full/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-full/build.gradle?rev=1888936&r1=1888935&r2=1888936&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-full/build.gradle (original)
+++ poi/trunk/poi-ooxml-full/build.gradle Sun Apr 18 22:11:26 2021
@@ -51,6 +51,14 @@ dependencies {
runtimeOnly "org.apache.logging.log4j:log4j-core:${log4jVersion}"
}
+idea {
+ module {
+ // Marks the already(!) added srcDir as "generated"
+ generatedSourceDirs += file(BEANS_SRC)
+ resourceDirs += file(BEANS_RES)
+ }
+}
+
final Pattern MODULE_REGEX = ~'\\.jar$'
final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
@@ -119,8 +127,8 @@ task generate_beans(dependsOn: copy_xsds
if (!ant.properties.xmlbeans_uptodate) {
ant.xmlbean(
schema: 'build/xsds',
- srcgendir: 'build/generated-sources',
- classgendir: 'build/generated-resources',
+ srcgendir: BEANS_SRC,
+ classgendir: BEANS_RES,
destfile: 'build/xsds.jar',
srconly: true,
failonerror: true,
Propchange: poi/trunk/poi-ooxml-lite/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
*.iml
build
+out
+gradle
+gradlew*
Propchange: poi/trunk/poi-ooxml-lite-agent/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
build
*.iml
+out
+gradle
+gradlew*
Modified: poi/trunk/poi-ooxml-lite/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite/build.gradle?rev=1888936&r1=1888935&r2=1888936&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite/build.gradle Sun Apr 18 22:11:26 2021
@@ -28,14 +28,20 @@ plugins {
final String JAVA9_SRC = 'src/main/java9'
final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
final String VERSIONS9 = 'META-INF/versions/9'
+final String BEANS_SRC = "${buildDir}/generated-sources"
+final String BEANS_RES = "${buildDir}/generated-resources"
sourceSets {
main {
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
}
+ compileClasspath += files(BEANS_RES)
+ java {
+ srcDirs += BEANS_SRC
+ }
resources {
- srcDirs += project(':poi-ooxml-full').sourceSets.main.output.findAll{it =~ /.*(classes\/java\/main|generated-resources)$/}
+ srcDirs += BEANS_RES
}
}
}
@@ -51,7 +57,8 @@ final Pattern MODULE_REGEX = ~'\\.jar$'
final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
final String OOXML_LITE_REPORT = '../build/ooxml-lite-report'
-task compileOoxmlLite() {
+
+task compileOoxmlLite(type: Copy) {
dependsOn ':poi-ooxml:build', ':poi-integration:build', ':poi-excelant:build'
File fileIn = file("${OOXML_LITE_REPORT}.clazz")
@@ -62,6 +69,14 @@ task compileOoxmlLite() {
ant.properties.ooxmlLiteUnchanged
}
+ // copy re-/sources to modules own directory to pacify IntelliJ, which doesn't like the same source dir in multiple modules
+ from(project(':poi-ooxml-full').buildDir) {
+ include 'generated-sources/**'
+ include 'generated-resources/**'
+ include 'classes/java/main/**'
+ }
+ into(buildDir)
+
doLast {
String header = fileOut.collect().findAll { !(it =~ /exports|}/) }.join('\n')
Propchange: poi/trunk/poi-scratchpad/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 22:11:26 2021
@@ -1,2 +1,5 @@
*.iml
build
+out
+gradle
+gradlew*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org