From a1305073c1b10589495ef6b68621684fb5b46458 Mon Sep 17 00:00:00 2001
From: sgdc3 <sgdc3.mail@gmail.com>
Date: Wed, 31 Jan 2018 19:31:54 +0100
Subject: [PATCH] Use circle 2.0

---
 .circleci/circle.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++
 circle.yml           | 20 -----------------
 2 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 .circleci/circle.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/circle.yml b/.circleci/circle.yml
new file mode 100644
index 000000000..a93423042
--- /dev/null
+++ b/.circleci/circle.yml
@@ -0,0 +1,51 @@
+version: 2
+jobs:
+  build_and_test_jdk8:
+    working_directory: ~/authmereloaded-jdk8
+    docker:
+      - image: circleci/openjdk:8-jdk
+    environment:
+        MAVEN_OPTS: -Xmx2048m
+    steps:
+      - checkout
+      - restore_cache:
+          key: authmereloaded-{{ checksum "pom.xml" }}
+     - run: mvn -T 2 dependency:go-offline
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: authmereloaded-{{ checksum "pom.xml" }}
+      - run: mvn -T 2 package
+      - store_test_results:
+          path: target/surefire-reports
+      - store_artifacts:
+          path: target/*.jar
+  build_and_test_jdk9:
+    working_directory: ~/authmereloaded-jdk9
+    docker:
+      - image: circleci/openjdk:9-jdk
+    environment:
+        MAVEN_OPTS: -Xmx2048m
+    steps:
+      - checkout
+      - restore_cache:
+          key: authmereloaded-{{ checksum "pom.xml" }}
+     - run: mvn -T 2 dependency:go-offline
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: authmereloaded-{{ checksum "pom.xml" }}
+      - run: mvn -T 2 package
+      - store_test_results:
+          path: target/surefire-reports
+      - store_artifacts:
+          path: target/*.jar
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build_and_test_jdk8
+      - build_and_test_jdk9
+notify:
+  webhooks:
+    - url: https://discordapp.com/api/webhooks/408312347388674048/Tv5q5C1Hyn-QnDis4GT0A2jlFtJ_n1Dw3R9LGIxLCNaZd7BuCKvPWIQSY-yHm9N_RCUi/slack
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index d6d8fcbbc..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-machine:
-  java:
-    version: oraclejdk8
-
-dependencies:
-  pre:
-    - "sudo apt-get update; sudo apt-get install -y git; sudo git clone https://www.github.com/P-H-C/phc-winner-argon2.git argon2-src; cd argon2-src; sudo make; sudo make install"
-  override:
-    - mvn -DskipTests clean install dependency:resolve-plugins dependency:go-offline
-
-test:
-  override:
-    - mvn -o surefire:test
-  post:
-    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
-    - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
-
-notify:
-  webhooks:
-    - url: https://discordapp.com/api/webhooks/408312347388674048/Tv5q5C1Hyn-QnDis4GT0A2jlFtJ_n1Dw3R9LGIxLCNaZd7BuCKvPWIQSY-yHm9N_RCUi/slack