merging from main

Author: AR Abdul Azeez

.github/workflows/publish-release.yml

@@ -1,9 +1,7 @@
 name: Publish Release
 
 on:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
       - main
 
@@ -13,7 +11,7 @@ permissions:
 
 jobs:
   publish:
-    if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'rel/')
+    if: contains(github.event.head_commit.message, 'rel/')
     runs-on: ubuntu-latest
 
     env:
@@ -25,10 +23,8 @@ jobs:
       GPG_FILE_NAME: onesignal_sdk_gpg_subkeys
 
     steps:
-      - name: Checkout release branch
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
+      - name: Checkout main
+        uses: actions/checkout@v5
 
       - name: Ensure Java 11 or 17
         run: |
@@ -58,6 +54,15 @@ jobs:
         run: ./gradlew assembleRelease
         working-directory: OneSignalSDK
 
+      - name:
+        Dry Run: Publish to Maven Local with signing
+        run: |
+          ./gradlew publishToMavenLocal --no-configuration-cache \
+            -Psigning.keyId="$SDK_SIGNING_KEY_ID" \
+            -Psigning.password="$SDK_SIGNING_PASSWORD" \
+            -Psigning.secretKeyRingFile="$(pwd)/$GPG_FILE_NAME"
+        working-directory: OneSignalSDK
+
       - name: Publish to Maven Central
         run: |
           ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache \
@@ -68,14 +73,10 @@ jobs:
             -Psigning.secretKeyRingFile="$(pwd)/$GPG_FILE_NAME"
         working-directory: OneSignalSDK
 
-      - name: Authenticate gh CLI
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
-
       - name: Tag and create GitHub Release
         run: |
           VERSION="${{ env.SDK_VERSION }}"
 
-          # Determine release channel
           if [[ "$VERSION" == *"alpha"* ]]; then
             PRERELEASE="--prerelease"
             CHANNEL="alpha"
@@ -87,15 +88,17 @@ jobs:
             CHANNEL="current"
           fi
 
-          # Extract PR body as release notes
-          PR_NUMBER=$(echo "${{ github.event.pull_request.number }}")
-          PR_BODY=$(gh pr view "$PR_NUMBER" --json body -q ".body")
+          # Fetch PR body using the commit SHA
+          PR_BODY=$(gh api /repos/${{ github.repository }}/commits/${{ github.sha }}/pulls \
+            -H "Accept: application/vnd.github.groot-preview+json" \
+            --jq '.[0].body')
+
           echo -e "Channels: $CHANNEL\n\n$PR_BODY" > release_notes.md
 
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-          echo "Tagging release v$VERSION"
+          echo "Tagging release $VERSION"
           git tag "$VERSION"
           git push origin "$VERSION"
 
@@ -105,5 +108,4 @@ jobs:
             --notes-file release_notes.md \
             $PRERELEASE
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,35 +1,37 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
+# Gradle
+.gradle/
+build/
+*/build/
 
+# Local properties
+local.properties
+OneSignalSDK/local.properties
+Examples/OneSignalDemo/local.properties
 
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
+# macOS
+.DS_Store
 
-# built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
+# IDE files
+.idea/
+*.iml
 
-# Java class files
-*.class
+# Captures
+captures/
+OneSignalSDK/captures/
+Examples/OneSignalDemo/captures/
 
-# generated files
-bin/
-gen/
+# GPG files
+*.gpg
 
-# Proguard folder generated by Eclipse
-proguard/
+# Misc
+*.log
+*.tmp
+*.swp
+*.swo
 
-# Examples
+# Node modules (if using JS tooling)
+node_modules/
 
-.idea/
-Examples/.idea/
-Examples/AndroidStudio/
-Examples/OneSignalDemo/app/build/
-OneSignalSDK/app/build/
+# Android Studio
+*.apk
+*.ap_

Examples/OneSignalDemo/.idea/vcs.xml

@@ -85,12 +85,12 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.12.0'
 
     /** START - Google Play Builds **/
-    gmsImplementation('com.onesignal:OneSignal:5.1.37')
+    gmsImplementation("com.onesignal:OneSignal:$SDK_VERSION")
     /** END - Google Play Builds **/
 
     /** START - Huawei Builds **/
     // Omit Google / Firebase libraries for Huawei builds.
-    huaweiImplementation('com.onesignal:OneSignal:5.1.37') {
+    huaweiImplementation("com.onesignal:OneSignal:$SDK_VERSION") {
         exclude group: 'com.google.android.gms', module: 'play-services-gcm'
         exclude group: 'com.google.android.gms', module: 'play-services-analytics'
         exclude group: 'com.google.android.gms', module: 'play-services-location'

Examples/OneSignalDemo/app/app.iml

@@ -30,6 +30,10 @@ allprojects {
     }
 }
 
+subprojects {
+    ext.SDK_VERSION = rootProject.findProperty("SDK_VERSION") ?: "x.x.x"
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

Examples/OneSignalDemo/app/build.gradle

@@ -14,3 +14,7 @@
 org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableJetifier=false
+
+# This is the name of the SDK to use when building your project.
+# This will be fed from the GitHub Actions workflow.
+SDK_VERSION=5.1.37