From 27a50398311137d19fd50c2aad3e63af249ecd03 Mon Sep 17 00:00:00 2001
From: Jeroen van Erp <jeroen@hierynomus.com>
Date: Tue, 14 Apr 2020 20:39:46 +0200
Subject: [PATCH] Fixes for GH Actions

---
 .github/workflows/gradle.yml             | 32 +++++++++++++++---------
 build.gradle                             |  4 +--
 gradle/wrapper/gradle-wrapper.properties |  4 +--
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 94352fba..0fa1658e 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -11,28 +11,36 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
-    name: Build with Java ${{ matrix.java }}
-    strategy:
-      matrix:
-        java: [ 8, 9 ]
-
+  java8:
+    name: Build with Java 8
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
-    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-    - name: Set up JDK ${{ matrix.java }}
+    - name: Set up JDK 8
       uses: actions/setup-java@v1
       with:
-        java-version: ${{ matrix.java }}
+        java-version: 8
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
       run: ./gradlew check
+  java9:
+    name: Build with Java 9
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 9
+      uses: actions/setup-java@v1
+      with:
+        java-version: 9
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew check -xanimalSnifferMain
+
   integration:
     name: Integration test
-    needs: [build]
+    needs: [java8]
     runs-on: [ubuntu-latest]
     steps:
       - uses: actions/checkout@v2
@@ -44,4 +52,4 @@ jobs:
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew integrationTest
-      
+
diff --git a/build.gradle b/build.gradle
index f7a104c8..bd5daae6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
   id "java"
   id "groovy"
   id "jacoco"
-  id "osgi"
+  id "com.github.blindpirate.osgi" version '0.0.3'
   id "maven-publish"
   id 'pl.allegro.tech.build.axion-release' version '1.11.0'
   id "com.bmuschko.docker-remote-api" version "3.2.1"
@@ -15,7 +15,7 @@ plugins {
   id 'ru.vyarus.java-lib' version '1.0.5'
   // id 'ru.vyarus.pom' version '1.0.3'
   id 'ru.vyarus.github-info' version '1.1.0'
-  id 'ru.vyarus.animalsniffer' version '1.4.2'
+  id 'ru.vyarus.animalsniffer' version '1.5.0'
 }
 
 group = "com.hierynomus"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7a35ef44..5b3f9ca6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionSha256Sum=038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists