Merge branch 'feature/module' into develop

bsorrentino · Dec 28, 2017 · 4b53f35 · 4b53f35
2 parents f3514a9 + 9102cc7
commit 4b53f35
Show file tree

Hide file tree

Showing 10 changed files with 221 additions and 124 deletions.
diff --git a/test/.vscode/settings.json → jdk8/.vscode/settings.json b/test/.vscode/settings.json → jdk8/.vscode/settings.json
diff --git a/test/main.js → jdk8/main.js b/test/main.js → jdk8/main.js
diff --git a/test/pom.xml → jdk8/pom.xml b/test/pom.xml → jdk8/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>java2ts-processor-test</artifactId>
-  <name>java2ts-processor::test - ${project.version}</name>
+  <artifactId>java2ts-processor-jdk8</artifactId>
+  <name>java2ts-processor::jdk8 - ${project.version}</name>
 
 	<parent>
 		<groupId>org.bsc.processor</groupId>

diff --git a/.../src/main/java/org/test/package-info.java → .../src/main/java/org/test/package-info.java b/.../src/main/java/org/test/package-info.java → .../src/main/java/org/test/package-info.java
@@ -5,7 +5,6 @@
  */
 @Java2TS(declare = {  
 	java.lang.Class.class,	
-	//java.lang.Object.class,
 	java.lang.Iterable.class,
     java.lang.CharSequence.class,
     java.lang.String.class,
@@ -20,6 +19,7 @@
     java.util.HashMap.class,
     java.util.HashSet.class,
     java.util.ArrayList.class,
+    java.util.Optional.class,
 
     java.nio.file.Files.class,
     java.nio.file.Path.class,
@@ -32,6 +32,7 @@
     java.util.function.Consumer.class,
     java.util.function.Predicate.class
 
+
 })
 package org.test;
 

diff --git a/test/src/main/ts/test.ts → jdk8/src/main/ts/test.ts b/test/src/main/ts/test.ts → jdk8/src/main/ts/test.ts
diff --git a/test/src/main/ts/utils.ts → jdk8/src/main/ts/utils.ts b/test/src/main/ts/utils.ts → jdk8/src/main/ts/utils.ts
diff --git a/test/tsconfig.json → jdk8/tsconfig.json b/test/tsconfig.json → jdk8/tsconfig.json
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     </properties>
     <modules>
     		<module>processor</module>
-    		<module>test</module>
+    		<module>jdk8</module>
     </modules>
     <dependencyManagement>
         <dependencies>