Merge branch 'master' of i2pgit.org:I2P_Developers/i2p.android.base

.github/workflows/github-sync.yml

@@ -1,22 +0,0 @@
-# File: .github/workflows/github-sync.yml for i2p-hackers/i2p.android.base
-on:
-  schedule:
-  - cron:  "*/5 * * * *"
-  workflow_dispatch:
-
-jobs:
-  repo-sync:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - name: repo-sync
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      uses: repo-sync/github-sync@v2
-      with:
-        source_repo: "https://i2pgit.org/i2p-hackers/i2p.android.base"
-        source_branch: "master"
-        destination_branch: "master"
-        github_token: ${{ secrets.PAT }}

.github/workflows/sync.yaml

@@ -0,0 +1,66 @@
+# GitHub Actions workflow file to sync an external repository to this GitHub mirror.
+# This file was automatically generated by go-github-sync.
+#
+# The workflow does the following:
+# - Runs on a scheduled basis (and can also be triggered manually)
+# - Clones the GitHub mirror repository
+# - Fetches changes from the primary external repository
+# - Applies those changes to the mirror repository
+# - Pushes the updated content back to the GitHub mirror
+#
+# Authentication is handled by the GITHUB_TOKEN secret provided by GitHub Actions.
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate Github Actions Environment
+        run: if [ "$GITHUB_ACTIONS" != "true" ]; then echo 'This script must be run in a GitHub Actions environment.'; exit 1; fi
+      - name: Checkout GitHub Mirror
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Configure Git
+        run: |-
+          git config user.name 'GitHub Actions'
+          git config user.email 'actions@github.com'
+      - env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        name: Sync Primary Repository
+        run: |-
+          # Add the primary repository as a remote
+          git remote add primary https://i2pgit.org/I2P_Developers/i2p.android.base.git
+
+          # Fetch the latest changes from the primary repository
+          git fetch primary
+
+          # Check if the primary branch exists in the primary repository
+          if git ls-remote --heads primary master | grep -q master; then
+            echo "Primary branch master found in primary repository"
+          else
+            echo "Error: Primary branch master not found in primary repository"
+            exit 1
+          fi
+
+          # Check if we're already on the mirror branch
+          if git rev-parse --verify --quiet master; then
+            git checkout master
+          else
+            # Create the mirror branch if it doesn't exist
+            git checkout -b master
+          fi
+
+
+          # Force-apply all changes from primary, overriding any conflicts
+          echo "Performing force sync from primary/master to master"
+          git reset --hard primary/master
+
+
+          # Push changes back to the mirror repository
+          git push origin master
+name: Sync Primary Repository to GitHub Mirror
+"on":
+  push: {}
+  schedule:
+    - cron: 0 * * * *
+  workflow_dispatch: {}

CHANGELOG

@@ -1,3 +1,6 @@
+2.9.0
+ * Update I2P Library
+
 2.8.0
  * Update I2P Library
  * Migrate to AndroidX

gradle.properties

@@ -14,9 +14,9 @@
 ANDROID_BUILD_SDK_VERSION=34
 ANDROID_BUILD_TARGET_SDK_VERSION=34
 GROUP=net.i2p.android
-I2P_ANDROID_VERSION=2.8.2
-I2P_ANDROID_VERSION_CODE=4745293
-I2P_VERSION=2.8.2-1
+I2P_ANDROID_VERSION=2.9.0
+I2P_ANDROID_VERSION_CODE=4745294
+I2P_VERSION=2.9.0-1
 POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
 POM_DEVELOPER_ID=idk
 POM_DEVELOPER_NAME=idk