Merge pull request #114 from VictorKabata/develop

Develop -> Main
VictorKabata · Aug 11, 2024 · fa83deb · fa83deb
2 parents f6487fd + 7ecb21f
commit fa83deb
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 20 deletions.
diff --git a/.github/workflows/publish_android.yml b/.github/workflows/publish_android.yml
@@ -14,16 +14,16 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '17'
 
-      - name: Make gradle executable
-        run: chmod +x ./gradlew
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build with gradle
         run: ./gradlew :daraja:build --stacktrace
@@ -34,16 +34,16 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '17'
 
-      - name: Make gradle executable
-        run: chmod +x ./gradlew
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Execute unit tests
         run: ./gradlew :daraja:check --stacktrace
@@ -55,16 +55,19 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '17'
 
-      - name: Make gradle executable
-        run: chmod +x ./gradlew
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Clean & Build
+        run: ./gradlew :daraja:clean :daraja:build --stacktrace
 
       - name: Sign and Publish Android Library
         run: ./gradlew :daraja:publishAndroidReleasePublicationToSonatypeRepository --max-workers 1 --stacktrace
@@ -74,6 +77,7 @@ jobs:
           POM_VERSION: ${{ github.event.inputs.androidVersionName }}
           POM_NAME: ${{ secrets.POM_NAME }}
           POM_DESCRIPTION: ${{ secrets.POM_DESCRIPTION }}
+          POM_GROUPID: ${{ secrets.POM_GROUPID }}
           POM_URL: ${{ secrets.POM_URL }}
           POM_DEVELOPER_ID: ${{ secrets.POM_DEVELOPER_ID }}
           POM_DEVELOPER_NAME: ${{ secrets.POM_DEVELOPER_NAME }}

diff --git a/.github/workflows/publish_swift_package.yml b/.github/workflows/publish_swift_package.yml
@@ -2,23 +2,30 @@ name: Create and Publish Swift Package
 
 on:
   workflow_dispatch:
+    inputs:
+      iOSVersionName:
+        description: 'iOS Version Name (eg. 0.9.0)'
+        required: true
 
 jobs:
   build:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '17'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Build iOS framework
         id: buildPackage
-        run: ./gradlew createSwiftPackage
+        run: ./gradlew createSwiftPackage --stacktrace
 
       - name: Upload Swift Package directory
         uses: actions/upload-artifact@v3
@@ -32,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download directory with swift package
         uses: actions/download-artifact@v3
@@ -52,4 +59,4 @@ jobs:
           destination-github-username: 'VictorKabata'
           destination-repository-name: 'DarajaSwiftPackage'
           create-target-branch-if-needed: true
-          target-branch: ${{ github.event.inputs.iOSBranchName }}
+          target-branch: ${{ github.event.inputs.iOSVersionName }}