From c4b582c51b3b2d6fa8ed0ea78f231784c041fa25 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 21 Dec 2022 15:59:47 +0100
Subject: [PATCH] Adapt CI to new structure.

---
 .github/workflows/pull_request.yml | 11 +++++------
 .github/workflows/release.yml      | 13 ++++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index cc550ed..cbb43d3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -21,17 +21,16 @@ jobs:
         with:
           java-version: 11
 
-      - name: Build Project
-        run: bash contrib/build.sh
+      - name: Install dependencies
+        run: bash ./install_deps.sh
 
       - name: Compile Project
         run: |
-          cd android-libkiwixbuild
-          ./gradlew androidSourcesJar build
+          ./gradlew generateHeaderFilesFromJavaWrapper
+          ./gradlew build
 
       - name: create unit coverage
         run: |
-          cd android-libkiwixbuild
           ./gradlew createCodeCoverageReport
 
       - name: Upload coverage to Codecov
@@ -43,4 +42,4 @@ jobs:
         with:
             name: Tests Coverage Report
             path: |
-              android-libkiwixbuild/build/coverage-report/
\ No newline at end of file
+              android-libkiwixbuild/build/coverage-report/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cf7fbed..bd95407 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,17 +25,20 @@ jobs:
           distribution: adopt
           java-version: 11
 
-      - name: Building Project
-        run: bash contrib/build.sh
+      - name: Install dependencies
+        run: bash ./install_deps.sh
+
+      - name: Compile Project
+        run: |
+          ./gradlew generateHeaderFilesFromJavaWrapper
+          ./gradlew build
 
       - name: Release build
         run: |
-          cd android-libkiwixbuild
           ./gradlew assemble
 
       - name: Genrate Source jar
         run: |
-          cd android-libkiwixbuild
           ./gradlew androidSourcesJar
 
       - name: Publish to MavenCentral
@@ -46,4 +49,4 @@ jobs:
           signing.keyId: ${{ secrets.SIGNING_KEY_ID }}
           siging.password: ${{ secrets.SIGNING_PASSWORD }}
           siging.key: ${{ secrets.SIGNING_KEY }}
-          sonatypeStagingProfileId: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
\ No newline at end of file
+          sonatypeStagingProfileId: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}