fixup! build without custom source path for java9

Signed-off-by: Sam Gammon <sam@elide.ventures>

annotations/.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/java9"/>
 	<classpathentry kind="lib" path="build_result/j2objc_annotations.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="build_result/eclipse"/>

annotations/Makefile

@@ -27,17 +27,16 @@ CLASSES_DIR = $(BUILD_DIR)/classes
 JAVA_SOURCE_DIR = src/main/java
 JAVA9_CLASSES_DIR = $(BUILD_DIR)/classes-java9
 JPMS_CLASS = $(JAVA9_CLASSES_DIR)/module-info.class
-JAVA9_SOURCE_DIR = src/main/java9
 
 SOURCE_JAVA_FULL = $(ANNOTATION_SOURCE_JAVA:%=$(JAVA_SOURCE_DIR)/%)
-SOURCE_JAVA9_MODULE = $(ANNOTATION_MODULE_INFO:%=$(JAVA9_SOURCE_DIR)/%)
+SOURCE_JAVA9_MODULE = $(ANNOTATION_MODULE_INFO:%=$(JAVA_SOURCE_DIR)/%)
 
 $(BUILD_DIR) $(CLASSES_DIR) $(JAVA9_CLASSES_DIR) $(DIST_JAR_DIR):
 	@mkdir -p $@
 
 $(JPMS_CLASS):
 	@echo Building j2objc annotations JPMS module
-	@$(JAVAC) -encoding UTF-8 --release 9 -d $(JAVA9_CLASSES_DIR) \
+	@$(JAVAC) -sourcepath $(JAVA_SOURCE_DIR) -encoding UTF-8 --release 9 -d $(JAVA9_CLASSES_DIR) \
 		-nowarn $(SOURCE_JAVA9_MODULE)
 
 $(JAR): $(SOURCE_JAVA_FULL) | $(BUILD_DIR) $(CLASSES_DIR) $(JAVA9_CLASSES_DIR) $(JPMS_CLASS)

annotations/annotations.iml

@@ -4,15 +4,13 @@
     <libelement value="jar://$MODULE_DIR$/build_result/j2objc_annotations.jar!/" />
     <src_description expected_position="0">
       <src_folder value="file://$MODULE_DIR$/src/main/java" expected_position="0" />
-      <src_folder value="file://$MODULE_DIR$/src/main/java9" expected_position="1" />
     </src_description>
   </component>
   <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/build_result/eclipse" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java9" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/build_result" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />

annotations/pom.xml

@@ -82,9 +82,6 @@
             <configuration>
               <release>9</release>
               <multiReleaseOutput>true</multiReleaseOutput>
-              <compileSourceRoots>
-                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
-              </compileSourceRoots>
             </configuration>
           </execution>
         </executions>