From 079229f1850528abfc11ab0b2bd6f4776f932d61 Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Tue, 26 May 2020 15:37:44 +0100
Subject: [PATCH] fix lint issues

---
 action.yml                 | 2 +-
 package.json               | 6 ++++++
 src/distro/adoptopenjdk.ts | 2 +-
 src/setup-java.ts          | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index c11bab7d..23ea6ff7 100644
--- a/action.yml
+++ b/action.yml
@@ -9,7 +9,7 @@ inputs:
        Early access versions can be specified in the form of e.g. 14-ea,
        14.0.0-ea, or 14.0.0-ea.28'
     required: true
-  vendor:
+  distro:
     description: 'The vendor to fetch the binary from (adoptopenjdk, zulu).
     Defaults to adoptopenjdk'
     required: false
diff --git a/package.json b/package.json
index 9f381736..590e46fc 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,15 @@
   "description": "setup java action",
   "main": "dist/index.js",
   "scripts": {
+<<<<<<< HEAD
     "build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts",
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts",
+=======
+    "build": "ncc build src/setup-java.ts",
+    "format": "prettier --write **/*.ts src/distro/*.ts",
+    "format-check": "prettier --check **/*.ts src/distro/*.ts",
+>>>>>>> fix lint issues
     "prerelease": "npm run-script build",
     "release": "git add -f dist/setup/index.js dist/cleanup/index.js",
     "test": "jest"
diff --git a/src/distro/adoptopenjdk.ts b/src/distro/adoptopenjdk.ts
index 744f652d..706307c3 100644
--- a/src/distro/adoptopenjdk.ts
+++ b/src/distro/adoptopenjdk.ts
@@ -20,4 +20,4 @@ export async function getJavaAdoptOpenJDK(
 function normalize(version: string): string {
   if (version == '1.8') return '8';
   return version;
-}
\ No newline at end of file
+}
diff --git a/src/setup-java.ts b/src/setup-java.ts
index 8eab312f..9483c1b5 100644
--- a/src/setup-java.ts
+++ b/src/setup-java.ts
@@ -11,6 +11,7 @@ async function run() {
     if (!version) {
       version = core.getInput(constants.INPUT_JAVA_VERSION, {required: true});
     }
+<<<<<<< HEAD
 <<<<<<< HEAD
     const vendor = core.getInput('vendor', {required: true});
     const arch = core.getInput(constants.INPUT_ARCHITECTURE, {required: true});
@@ -20,6 +21,9 @@ async function run() {
     const jdkFile = core.getInput(constants.INPUT_JDK_FILE, {required: false});
 =======
     const distro = core.getInput('vendor', {required: true});
+=======
+    const distro = core.getInput('distro', {required: true});
+>>>>>>> fix lint issues
     const arch = core.getInput('architecture', {required: true});
     const javaPackage = core.getInput('java-package', {required: true});
     const jdkFile = core.getInput('jdkFile', {required: false}) || '';