-TypeGraph Visitor for incremental builds

.circleci/config.yml

@@ -0,0 +1,149 @@
+defaults: &defaults
+    docker:
+      - image: vertispan/openjdk:8u222-jdk-stretch
+
+version: 2
+jobs:
+  closure_library:
+    <<: *defaults
+    working_directory: ~/
+    steps:
+      - run:
+          name: create build cache key
+          command: echo $CIRCLE_SHA1 > .circle-sha
+      - restore_cache:
+          name: Restoring Cache - closure-library
+          keys:
+            - v1-closure-library-{{ checksum ".circle-sha" }}
+            # if cache is not present load any most recent
+            - v1-closure-library-
+      - run:
+          name: update or clone closure-library
+          command: |
+            if [ -e closure-library ]; then
+              # if the cache contained it, let's just update
+              echo update from remote
+
+              cd closure-library
+              git remote update
+              git reset --hard origin/master
+            else
+              echo cloning repository
+              git clone https://github.com/google/closure-library
+            fi
+      - save_cache: # TODO this should probably be using workspace, not cache
+          name: Saving Cache - closure-library
+          key: v1-closure-library-{{ checksum ".circle-sha" }}
+          paths:
+            - ~/closure-library
+
+  build:
+    <<: *defaults
+    working_directory: ~/j2cl
+    steps:
+      - checkout
+      - run:
+          name: create build cache key
+          command: echo $CIRCLE_SHA1 > .circle-sha
+      - run:
+          name: environment check
+          command: |
+            java -XX:+PrintFlagsFinal -version | grep -iE 'HeapSize|PermSize|ThreadStackSize'
+            env MAVEN_OPTS="-XX:+PrintFlagsFinal" mvn -version | grep -iE 'HeapSize|PermSize|ThreadStackSize'
+            mvn -version
+
+#      - run:
+#          name: Rebase j2cl onto google upstream changes
+#          command: |
+#            echo rebasing onto upstream
+#            set +e
+#            git remote get-url upstream
+#            if [ $? != 0 ]; then
+#              echo adding google remote
+#              git remote add upstream git@github.com:google/j2cl.git
+#            fi
+#            set -e
+#            echo setup local git user
+#            git config --global user.email "sales@vertispan.com"
+#            git config --global user.name "Vertispan CI"
+#            echo git remote update
+#            git remote update
+#            #echo git checkout origin/master
+#            #git checkout origin/master
+#
+#            echo starting rebase on upstream/master
+#            set +e
+#            # temp comment out the rebase to test build
+#            git rebase upstream/master
+#            exitCode=$?;
+#            set -e
+#
+#            if [ $exitCode != 0 ]; then
+#              # not really needed
+#              echo rebase failure
+#              git rebase --abort
+#              exit $exitCode;
+#            fi
+
+      - restore_cache: # TODO this should probably be using workspace, not cache
+          name: Restoring Cache - closure-library
+          keys:
+            - v1-closure-library-{{ checksum ".circle-sha" }}
+            # if cache is not present load any most recent - shouldn't happen by this point of build
+            - v1-closure-library-
+
+      - restore_cache:
+          name: Restoring cache - bazel repository
+          key: v1-bazel-{{ checksum ".bazelversion" }}-{{ checksum "WORKSPACE" }}-{{ checksum "build_defs/repository.bzl" }}
+          paths:
+            - ~/bazel_repository_cache
+      - run:
+          name: Initialize bazel options
+          command: |
+            # limit the bazel jobs due to failures in circleci
+            echo "build --jobs=1" >> .bazelrc
+            echo "build --local_ram_resources=512" >> .bazelrc
+            echo "--host_jvm_args=-Xmx512m" >> .bazelrc
+            # ask bazel to put its downloaded resources in a directory we can cache
+            echo "build --repository_cache=~/bazel_repository_cache" >> .bazelrc
+            # verify that all dependencies are up to date
+            bazel sync
+      - run:
+          name: Run bazel build
+          command: |
+            cd maven
+            # try up to 4 times, bazel requests more resources than circleci will give it
+            ./build.sh || ./build.sh || ./build.sh || ./build.sh
+      - save_cache:
+          name: Save Cache - bazel repository
+          key: v1-bazel-{{ checksum ".bazelversion" }}-{{ checksum "WORKSPACE" }}-{{ checksum "build_defs/repository.bzl" }}
+          paths:
+            - ~/bazel_repository_cache
+      - restore_cache:
+          name:  Restoring Cache - m2 repository
+          keys:
+            - v1-dependencies-{{ checksum "maven/pom.xml" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run:
+          name: Deploy jars
+          command: |
+            cd maven
+            mvn deploy -s ../.circleci/settings.xml -Dartifactory.username=$ARTIFACTORY_USER -Dartifactory.password=$ARTIFACTORY_APIKEY
+      - save_cache:
+          name:  Save Cache - m2 repository
+          paths:
+            - ~/.m2/repository
+          key: v1-dependencies-{{ checksum "maven/pom.xml" }}
+
+
+workflows:
+  version: 2
+  ci_build:
+    jobs:
+      - closure_library
+      - build:
+          requires:
+            - closure_library
+          context: deploy-keys
+

.circleci/settings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
+          xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <servers>
+    <server>
+      <id>vertispan-snapshots</id>
+      <username>${artifactory.username}</username>
+      <password>${artifactory.password}</password>
+    </server>
+  </servers>
+</settings>
+

build_defs/internal_do_not_use/j2cl_library.bzl

@@ -66,10 +66,10 @@ def j2cl_library(
         _to_j2wasm_targets("exports", j2wasm_args)
         j2wasm_args["tags"] = (j2wasm_args.get("tags") or []) + ["manual", "notap"]
 
-        j2wasm_library(
-            name = j2wasm_library_name,
-            **j2wasm_args
-        )
+#        j2wasm_library(
+#            name = j2wasm_library_name,
+#            **j2wasm_args
+#        )
 
 _ALLOWED_ATTRS = [key for key in J2WASM_LIB_ATTRS] + ["tags", "visibility"]
 

build_defs/internal_do_not_use/j2cl_workspace.bzl

@@ -218,7 +218,7 @@ filegroup(
         actual = "@com_google_guava",
     )
 
-    # Required by protobuf_java_util
+    # Required by protobuf_java_util, also needed by generator
     native.bind(
         name = "gson",
         actual = "@com_google_code_gson",

jre/javatests/com/google/gwt/junit/BUILD

@@ -0,0 +1,11 @@
+licenses([
+    "notice",  # Apache
+])
+
+load("//build_defs:rules.bzl", "j2cl_library")
+
+j2cl_library(
+    name = "gwttestcase_emul",
+    srcs = glob(["**/*.java"]),
+    deps = ["//junit/emul/java:junit_emul"]
+)

jre/javatests/com/google/gwt/junit/client/GWTTestCase.java

@@ -46,4 +46,11 @@ protected final void setUp() throws Exception {
   protected final void tearDown() throws Exception {
     gwtTearDown();
   }
+
+  protected final void delayTestFinish(int timeoutMillis) {
+
+  }
+
+  protected final void finishTest() {
+  }
 }

junit/emul/java/BUILD

@@ -10,5 +10,8 @@ j2cl_library(
     javacopts = [
         "-Xep:DoNotCall:OFF",
     ],
-    visibility = ["//:__pkg__"],
+    visibility = [
+        "//:__pkg__",
+        "//jre:__subpackages__",
+    ],
 )

junit/generator/java/com/google/j2cl/junit/apt/BUILD

@@ -36,4 +36,16 @@ java_library(
         "//third_party:jsr305_annotations",
         "//third_party:junit",
     ],
+    plugins = [":autoservice_plugin"],
 )
+
+
+java_plugin(
+    name = "autoservice_plugin",
+    processor_class = "com.google.auto.service.processor.AutoServiceProcessor",
+    deps = [
+        "//third_party:auto_service",
+        "//third_party:guava",
+        "//third_party:auto_common",
+    ],
+)

junit/generator/java/com/google/j2cl/junit/apt/J2clTestingProcessingStep.java

@@ -63,10 +63,11 @@ public Set<? extends Class<? extends Annotation>> annotations() {
   @Override
   public Set<Element> process(
       SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
-    Element value = Iterables.getOnlyElement(elementsByAnnotation.get(J2clTestInput.class));
-    String className =
-        MoreApt.getClassNameFromAnnotation(value, J2clTestInput.class, "value").get();
-    handleClass(className);
+    elementsByAnnotation.get(J2clTestInput.class).forEach(value -> {
+      String className =
+          MoreApt.getClassNameFromAnnotation(value, J2clTestInput.class, "value").get();
+      handleClass(className);
+    });
     return ImmutableSet.of();
   }
 

junit/generator/java/com/google/j2cl/junit/apt/TemplateWriter.java

@@ -87,7 +87,7 @@ private String mergeTemplate(TestClass testClass, String template) throws Except
   private void writeResource(String qualifiedName, String content) throws IOException {
     try (Writer writer =
         filer
-            .createResource(StandardLocation.CLASS_OUTPUT, "", qualifiedName, new Element[0])
+            .createResource(StandardLocation.SOURCE_OUTPUT, "", qualifiedName, new Element[0])
             .openWriter()) {
       writer.write(content);
     }

maven/ast/pom.xml

@@ -0,0 +1,75 @@
+<?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>
+
+  <parent>
+    <groupId>com.vertispan.j2cl</groupId>
+    <artifactId>j2cl-parent</artifactId>
+    <version>0.9-SNAPSHOT</version>
+  </parent>
+  <artifactId>ast</artifactId>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>../../bazel-bin/transpiler/java/com/google/j2cl/transpiler/ast/libast.jar</file>
+                  <type>jar</type>
+                </artifact>
+                <artifact>
+                  <file>../../bazel-bin/transpiler/java/com/google/j2cl/transpiler/ast/libast-src.jar</file>
+                  <type>jar</type>
+                  <classifier>sources</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.vertispan.j2cl</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vertispan.j2cl</groupId>
+      <artifactId>common-visitor</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>