Skip to content

Commit f61a45a

Browse files
committed
[build] stash newer compiler plugin experiments
1 parent ebadc7a commit f61a45a

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

Mavenfile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ plugin( :compiler, '3.1',
5050
:encoding => 'UTF-8', :debug => true,
5151
:showWarnings => true, :showDeprecation => true,
5252
:excludes => [ 'module-info.java' ],
53+
#:jdkToolchain => { :version => '[1.7,11)' },
5354

5455
:generatedSourcesDirectory => gen_sources,
55-
:annotationProcessors => [ 'org.jruby.anno.AnnotationBinder' ],
56-
:compilerArgs => [ '-XDignore.symbol.file=true' ] ) do
56+
:annotationProcessors => [ 'org.jruby.anno.AnnotationBinder' ]) do
5757

5858
#execute_goal :compile, :id => 'annotation-binder', :phase => 'compile',
5959
# :generatedSourcesDirectory => gen_sources, #:outputDirectory => gen_sources,
@@ -62,15 +62,19 @@ plugin( :compiler, '3.1',
6262
# :useIncrementalCompilation => false, :fork => true, :verbose => true,
6363
# :compilerArgs => [ '-XDignore.symbol.file=true', '-J-Dfile.encoding=UTF-8' ]
6464

65-
execute_goal :compile, :id => 'compile-populators', :phase => 'process-classes',
66-
:includes => [ 'org/jruby/gen/**/*.java' ], :optimize => true,
67-
:compilerArgs => [ '-XDignore.symbol.file=true' ]
68-
# NOTE: maybe '-J-Xbootclasspath/p:${unsafe.jar}' ... as well ?!
65+
execute_goal :compile,
66+
:id => 'compile-populators', :phase => 'process-classes',
67+
:includes => [ 'org/jruby/gen/**/*.java' ],
68+
:optimize => true,
69+
:compilerArgs => [ '', '-XDignore.symbol.file=true' ]
6970
end
7071

7172
profile 'module-info' do
7273
activation { jdk '[9,)' }
73-
plugin :compiler, '3.1', :source => '9', :target => java_target, :includes => [ 'module-info.java' ]
74+
plugin :compiler, '3.8.1',
75+
:source => '9', :target => java_target,
76+
:release => '9',
77+
:includes => [ 'module-info.java' ]
7478
end
7579

7680
plugin :clean do

pom.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ DO NOT MODIFIY - GENERATED CODE
6161
</distributionManagement>
6262
<properties>
6363
<bc.versions>1.62</bc.versions>
64-
<invoker.skip>${maven.test.skip}</invoker.skip>
65-
<invoker.test>${bc.versions}</invoker.test>
66-
<jruby.plugins.version>1.1.8</jruby.plugins.version>
64+
<mavengem.wagon.version>1.0.3</mavengem.wagon.version>
6765
<jruby.switches>-W0</jruby.switches>
6866
<jruby.version>9.1.17.0</jruby.version>
69-
<jruby.versions>9.1.17.0</jruby.versions>
67+
<jruby.plugins.version>1.1.8</jruby.plugins.version>
68+
<invoker.skip>${maven.test.skip}</invoker.skip>
69+
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
7070
<mavengem-wagon.version>1.0.3</mavengem-wagon.version>
71-
<mavengem.wagon.version>1.0.3</mavengem.wagon.version>
72-
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
71+
<jruby.versions>9.1.17.0</jruby.versions>
7372
<polyglot.dump.readonly>true</polyglot.dump.readonly>
74-
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
73+
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
74+
<invoker.test>${bc.versions}</invoker.test>
7575
</properties>
7676
<dependencies>
7777
<dependency>
@@ -275,6 +275,7 @@ DO NOT MODIFIY - GENERATED CODE
275275
</includes>
276276
<optimize>true</optimize>
277277
<compilerArgs>
278+
<compilerArg></compilerArg>
278279
<compilerArg>-XDignore.symbol.file=true</compilerArg>
279280
</compilerArgs>
280281
</configuration>
@@ -294,9 +295,6 @@ DO NOT MODIFIY - GENERATED CODE
294295
<annotationProcessors>
295296
<annotationProcessor>org.jruby.anno.AnnotationBinder</annotationProcessor>
296297
</annotationProcessors>
297-
<compilerArgs>
298-
<compilerArg>-XDignore.symbol.file=true</compilerArg>
299-
</compilerArgs>
300298
</configuration>
301299
</plugin>
302300
<plugin>
@@ -388,10 +386,11 @@ DO NOT MODIFIY - GENERATED CODE
388386
<plugins>
389387
<plugin>
390388
<artifactId>maven-compiler-plugin</artifactId>
391-
<version>3.1</version>
389+
<version>3.8.1</version>
392390
<configuration>
393391
<source>9</source>
394392
<target>1.7</target>
393+
<release>9</release>
395394
<includes>
396395
<include>module-info.java</include>
397396
</includes>

0 commit comments

Comments
 (0)