Updated 1.1.2 version

nowsecure · Jan 22, 2020 · aabbdde · aabbdde
1 parent 071d1c8
commit aabbdde
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 10 deletions.
diff --git a/.circleci/orb/orb-inline.yml b/.circleci/orb/orb-inline.yml
@@ -135,9 +135,9 @@ orbs:
         - attach_workspace:
             at: /tmp/workspace
         - run: cp apkpure_app_887.apk /tmp/workspace/test.apk
-        - run: curl -Ls https://github.com/nowsecure/auto-circleci-plugin/archive/1.1.0.tar.gz | tar -xzf - -C .
+        - run: curl -Ls https://github.com/nowsecure/auto-circleci-plugin/archive/1.1.2.tar.gz | tar -xzf - -C .
         - run:
-            command: cd auto-circleci-plugin-1.1.0 && gradle run -Dauto.url=<< parameters.auto_url >> -Dauto.token=<< parameters.auto_token >> -Dauto.dir=<< parameters.auto_dir >> -Dauto.file=<< parameters.auto_file >> -Dauto.group=<< parameters.auto_group >> -Dauto.wait=<< parameters.auto_wait >> -Dauto.score=<< parameters.auto_score >> -Dauto.username=<<parameters.auto_username>> -Dauto.password=<<parameters.auto_password>> -Dauto.show.status.messages=<<parameters.auto_show_status_messages>> -Dauto.stop.tests.on.status=<<parameters.auto_stop_tests_on_status>>
+            command: cd auto-circleci-plugin-1.1.2 && gradle run -Dauto.url=<< parameters.auto_url >> -Dauto.token=<< parameters.auto_token >> -Dauto.dir=<< parameters.auto_dir >> -Dauto.file=<< parameters.auto_file >> -Dauto.group=<< parameters.auto_group >> -Dauto.wait=<< parameters.auto_wait >> -Dauto.score=<< parameters.auto_score >> -Dauto.username=<<parameters.auto_username>> -Dauto.password=<<parameters.auto_password>> -Dauto.show.status.messages=<<parameters.auto_show_status_messages>> -Dauto.stop.tests.on.status=<<parameters.auto_stop_tests_on_status>>
             no_output_timeout: 90m
         - persist_to_workspace:
             root: /tmp/workspace

diff --git a/.circleci/orb/orb.yml b/.circleci/orb/orb.yml
@@ -72,9 +72,9 @@ commands:
     steps:
     - attach_workspace:
         at: /tmp/workspace
-    - run: curl -Ls https://github.com/nowsecure/auto-circleci-plugin/archive/1.1.0.tar.gz | tar -xzf - -C .
+    - run: curl -Ls https://github.com/nowsecure/auto-circleci-plugin/archive/1.1.2.tar.gz | tar -xzf - -C .
     - run:
-        command: cd auto-circleci-plugin-1.1.0 && gradle run -Dauto.url=<< parameters.auto_url >> -Dauto.token=<< parameters.auto_token >> -Dauto.dir=<< parameters.auto_dir >> -Dauto.file=<< parameters.auto_file >> -Dauto.group=<< parameters.auto_group >> -Dauto.wait=<< parameters.auto_wait >> -Dauto.score=<< parameters.auto_score >> -Dauto.username=<<parameters.auto_username>> -Dauto.password=<<parameters.auto_password>> -Dauto.show.status.messages=<<parameters.auto_show_status_messages>> -Dauto.stop.tests.on.status=<<parameters.auto_stop_tests_on_status>>
+        command: cd auto-circleci-plugin-1.1.2 && gradle run -Dauto.url=<< parameters.auto_url >> -Dauto.token=<< parameters.auto_token >> -Dauto.dir=<< parameters.auto_dir >> -Dauto.file=<< parameters.auto_file >> -Dauto.group=<< parameters.auto_group >> -Dauto.wait=<< parameters.auto_wait >> -Dauto.score=<< parameters.auto_score >> -Dauto.username=<<parameters.auto_username>> -Dauto.password=<<parameters.auto_password>> -Dauto.show.status.messages=<<parameters.auto_show_status_messages>> -Dauto.stop.tests.on.status=<<parameters.auto_stop_tests_on_status>>
         no_output_timeout: 90m
     - persist_to_workspace:
         root: /tmp/workspace

diff --git a/Development.md b/Development.md
@@ -45,10 +45,14 @@ circleci orb validate .circleci/orb/orb.yml
 
 ### Github release
 Create new tag and release for the new version. Note: the orb.yml should reference new version 
-- Search all files for 1.1.0 (or latest version)
+- edit src/main/resources/version.txt
+- ./gradlew fatJar
+- cp build/libs/all-in-one-jar-1.xx.jar dist
+- Search all files for 1.xx (or latest version)
 - Update .circleci/orb/orb.yml with new version
 - Tag and release new version in github
 
+
 ### Publish Dev config
 ```
 circleci orb publish .circleci/orb/orb.yml nowsecure/ci-auto-orb@dev:alpha

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /home/gradle
 
 #
 # plugin version from https://github.com/nowsecure/auto-circleci-plugin/releases
-ARG plugin_version=1.1.0
+ARG plugin_version=1.1.2
 #
 # Default auto url
 ARG auto_url=https://lab-api.nowsecure.com

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ You can use Auto CircleCI Orb as follows:
 ```
 version: 2.1
 orbs:
-  auto_ci: nowsecure/[email protected].0
+  auto_ci: nowsecure/[email protected].2
 jobs:
   build:
     docker:

diff --git a/dist/all-in-one-jar-1.1.2.jar b/dist/all-in-one-jar-1.1.2.jar
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group="nowsecure-auto"
-build=1
+build=2
 org.gradle.daemon=false
diff --git a/src/main/java/com/nowsecure/auto/circleci/Main.java b/src/main/java/com/nowsecure/auto/circleci/Main.java
@@ -24,7 +24,7 @@ public class Main implements NSAutoParameters, NSAutoLogger {
     private static final int TIMEOUT = 60000;
     private static String PLUGIN_NAME = "circleci-nowsecure-auto-security-test";
     private static final String DEFAULT_URL = "https://lab-api.nowsecure.com";
-    private String apiUrl = DEFAULT_URL;
+    private String apiUrl;
     private String group;
     private File file;
     private int waitMinutes;

diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-1.1.0
+1.1.2
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ You can use Auto CircleCI Orb as follows: @@
     ```
     version: 2.1
     orbs:
-      auto_ci: nowsecure/[email protected].0
+      auto_ci: nowsecure/[email protected].2
     jobs:
       build:
         docker:
@@ Expand Down @@