Skip to content

Commit aafa3d5

Browse files
committed
Adds JDK 8 to supported versions, updates build plugin to use the current
source setting to determine which compiler to use. #210
1 parent 7c1502f commit aafa3d5

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

flapi-descriptor/src/test/java/unquietcode/tools/flapi/builder/MainDescriptor.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,19 @@
55
import unquietcode.tools.flapi.Flapi;
66
import unquietcode.tools.flapi.generator.naming.HashedNameGenerator;
77

8+
import javax.lang.model.SourceVersion;
9+
810
/**
911
* @author Benjamin Fagin
1012
* @version 04-25-2012
1113
*
1214
* The main descriptor for Flapi, used to generate other descriptors.
1315
*/
1416
public class MainDescriptor implements DescriptorMaker {
17+
static {
18+
Flapi.setJDKVersion(SourceVersion.RELEASE_7);
19+
}
20+
1521
private static final int DOC_GROUP = 1;
1622
private static final int RETURN_TYPE_GROUP = 2;
1723
private static final int NAME_GROUP = 3;

flapi-plugin/src/main/java/unquietcode/tools/flapi/plugin/PluginHelper.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import unquietcode.tools.flapi.Descriptor;
2121
import unquietcode.tools.flapi.DescriptorMaker;
2222
import unquietcode.tools.flapi.ExtractRuntime;
23+
import unquietcode.tools.flapi.Flapi;
2324
import unquietcode.tools.flapi.plugin.compile.CharSequenceJavaFileObject;
2425
import unquietcode.tools.flapi.plugin.compile.ClassFileManager;
2526

@@ -239,14 +240,12 @@ private ClassLoader compileAndWriteClasses(Descriptor descriptor, URLClassLoader
239240
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
240241
DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<JavaFileObject>();
241242
JavaFileManager fileManager = new ClassFileManager(compiler.getStandardFileManager(null, null, null), classesDirectory);
243+
final String jdkVersion = "1."+Flapi.getJDKVersion().ordinal();
242244

243-
List<String> options = new ArrayList<String>();
244-
options.add("-classpath");
245-
options.add(makeClasspath(classLoader));
246-
options.add("-source");
247-
options.add("1.6");
248-
options.add("-target");
249-
options.add("1.6");
245+
List<String> options = new ArrayList<>();
246+
options.add("-classpath"); options.add(makeClasspath(classLoader));
247+
options.add("-source"); options.add(jdkVersion);
248+
options.add("-target"); options.add(jdkVersion);
250249

251250
Iterable<? extends JavaFileObject> compilationUnits = getSourceFiles(descriptor);
252251
JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, diagnostics, options, null, compilationUnits);

src/main/java/unquietcode/tools/flapi/Flapi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @version 05-11-2012
3838
*/
3939
public class Flapi {
40-
private static SourceVersion JDKVersion = SourceVersion.RELEASE_7;
40+
private static SourceVersion JDKVersion = SourceVersion.RELEASE_8;
4141
private static boolean outputRuntime = false;
4242

4343

@@ -78,7 +78,7 @@ public static void setJDKVersion(SourceVersion version) {
7878
if (version != null && version.ordinal() >= SourceVersion.RELEASE_5.ordinal()) {
7979
JDKVersion = version;
8080
} else {
81-
throw new DescriptorBuilderException("Only JDK versions [5,7] are supported.");
81+
throw new DescriptorBuilderException("Only JDK versions [5,8] are supported.");
8282
}
8383
}
8484

0 commit comments

Comments
 (0)