2.5.1

.github/workflows/ant.yml

@@ -13,7 +13,6 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - name: GetText
         run: sudo apt install gettext git
@@ -31,7 +30,7 @@ jobs:
       - name: build with Gradle
         run: |
           echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
-          git clone -b i2p-2.3.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          git clone -b i2p-2.4.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
           ./gradlew assembleDebug
           find . -name '*.apk'
       - name: Upload i2p-debug-${{ github.sha }}.apk
@@ -42,7 +41,6 @@ jobs:
 
   trunk:
     runs-on: ubuntu-latest
-
     steps:
       - name: GetText
         run: sudo apt install gettext git
@@ -58,8 +56,8 @@ jobs:
           echo "build.built-by=GitHub Actions" >> override.properties
           echo "noExe=true" >> override.properties
           grep -v I2P_ gradle.properties > gradle.properties.update
-          echo "I2P_VERSION=2.4.0-1" >> gradle.properties.update
-          echo "I2P_ANDROID_VERSION=2.4.0-1" >> gradle.properties.update
+          echo "I2P_VERSION=2.5.0-1" >> gradle.properties.update
+          echo "I2P_ANDROID_VERSION=2.5.0-1" >> gradle.properties.update
           cp -v gradle.properties.update gradle.properties
       - name: build with Gradle
         run: |
@@ -71,5 +69,5 @@ jobs:
       - name: Upload i2p-debug-${{ github.sha }}.apk
         uses: actions/upload-artifact@v4
         with:
-          name: i2p-debug-${{ github.sha }}.apk
+          name: i2p-debug-trunk-${{ github.sha }}.apk
           path: ./app/build/outputs/apk/free/debug/app-free-debug.apk

.github/workflows/github-sync.yml

@@ -0,0 +1,22 @@
+# 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/release.yml

@@ -42,7 +42,8 @@ jobs:
           workflow: ant.yml
           if_no_artifact_found: fail
       # remove .zip file extension
-      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      #- run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      - run: unzip i2p-debug.apk.zip
       - run: echo "" | tee -a RELEASE.md
       - run: echo "## Checksums" | tee -a RELEASE.md
       - run: echo "" | tee -a RELEASE.md

.github/workflows/sign.yml

@@ -0,0 +1,95 @@
+# Mostly copied from https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant
+# zlatinb
+
+name: Java Signed CI
+
+on: [push]
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build-signed:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GetText
+        run: sudo apt install gettext git
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Generate override.properties
+        env:
+          DEV_SIGNING_KEY: ${{ secrets.DEV_SIGNING_KEY }}
+          DEV_PASSWORD: ${{ secrets.DEV_PASSWORD }}
+        run: |
+          rm -f override.properties
+          mv etc/github.gradle.properties gradle.properties
+          mv etc/github.signing.properties signing.properties
+          mkdir -p $HOME/keystores/
+          echo $DEV_SIGNING_KEY | base64 --decode > $HOME/keystores/android-release.keystore
+          echo "KEY_ALIAS=mykey" >> signing.properties
+          echo "KEY_PASSWORD=$DEV_PASSWORD" >> signing.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: build with Gradle
+        run: |
+          echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
+          git clone -b i2p-2.4.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          ./gradlew assembleRelease
+          find . -name '*.apk'
+          ls -lah $HOME/keystores/android-release.keystore
+          ls -d $HOME
+      - name: Upload i2p-debug-${{ github.sha }}.apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-debug.apk
+          path: ./app/build/outputs/apk/free/debug/app-free-debug.apk
+
+  trunk-signed:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GetText
+        run: sudo apt install gettext git
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Generate override.properties
+        env:
+          DEV_SIGNING_KEY: ${{ secrets.DEV_SIGNING_KEY }}
+          DEV_PASSWORD: ${{ secrets.DEV_PASSWORD }}
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+          mv etc/github.gradle.properties gradle.properties
+          mv etc/github.signing.properties signing.properties
+          mkdir -p $HOME/keystores/
+          echo $DEV_SIGNING_KEY | base64 --decode > $HOME/keystores/android-release.keystore
+          echo "KEY_ALIAS=mykey" >> signing.properties
+          echo "KEY_PASSWORD=$DEV_PASSWORD" >> signing.properties
+          grep -v I2P_ gradle.properties > gradle.properties.update
+          echo "I2P_VERSION=2.5.0-1" >> gradle.properties.update
+          echo "I2P_ANDROID_VERSION=2.5.0-1" >> gradle.properties.update
+          cp -v gradle.properties.update gradle.properties
+      - name: build with Gradle
+        run: |
+          echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
+          git clone -b master https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          bash -c "cd $HOME/i2p.i2p && ./installer/resources/maven-dev-release.sh 1"
+          ./gradlew assembleRelease
+          find . -name '*.apk'
+          ls -lah $HOME/keystores/android-release.keystore
+          ls -d $HOME
+      - name: Upload i2p-debug-${{ github.sha }}.apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-debug-trunk-${{ github.sha }}.apk
+          path: ./app/build/outputs/apk/free/debug/app-free-debug.apk

app/build.gradle

@@ -8,7 +8,7 @@ repositories {
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     defaultConfig {
-        versionCode 4745280
+        versionCode 4745282
         versionName "$I2P_ANDROID_VERSION"
         minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)

app/src/main/res/raw/welcome_html

@@ -82,8 +82,7 @@ call!</li>
 href="http://i2pforum.i2p/" target="_blank">i2pforum.i2p</a>: A secure
         and anonymous online forum community where developers
 and users alike discuss problems and ideas relating to I2P and associated 
-topics, and <a href="http://zzz.i2p/" target="_blank">zzz's developer 
-forums</a> for both end users and developers.</li>
+topics.</li>
       <li class="tidylist"><b>I2P Anonymous Pastebin</b><br><a 
 href="http://paste.idk.i2p/" target="_blank">paste.idk.i2p</a>: Secure and
         anonymous paste service allowing anonymous text and text-based code 
@@ -148,7 +147,7 @@ via <a href="irc://irc.freenode.net/i2p">Freenode IRC</a>.
 <li class="tidylist"><b>Reporting Bugs</b><br>If you'd like to report a bug, 
 please file a ticket on <a href="http://git.idk.i2p/"
 target="_blank">git.idk.i2p</a>. For developer-related discussions, please
-visit <a href="http://zzz.i2p/" target="_blank">zzz's developer forums</a> or 
+visit <a href="http://i2pforum.i2p/" target="_blank">I2P's developer forums</a> or
 come and visit the <a href="irc://127.0.0.1:6668/i2p-dev">developer channel</a> 
 on I2P's IRC network. Developers can browse source at <a 
 href="git.idk.i2p/i2p-hackers/i2p.i2p/-/commits/master" target="_blank">git.idk.i2p</a> or

app/src/main/res/values/strings.xml

@@ -221,7 +221,7 @@
     <string name="about_project">Project Home:</string>
     <string name="url_project" translatable="false">https://geti2p.net | http://i2p-projekt.i2p</string>
     <string name="about_bugs">Bugs and Support:</string>
-    <string name="url_android_forum" translatable="false">http://zzz.i2p/forums/17</string>
+    <string name="url_android_forum" translatable="false">http://i2pforum.i2p</string>
     <string name="about_helpwanted">Help Wanted!</string>
     <string name="about_volunteer">Want to help make the app better? Volunteer on the Android forum:</string>
     <string name="about_gitlab">Want to suggest a feature or fix a bug? make a Merge Request on the Android Gitlab:</string>

etc/github.gradle.properties

@@ -0,0 +1,23 @@
+
+GROUP=net.i2p.android
+
+org.gradle.jvmargs=-Xmx1536M
+
+POM_URL=https://github.com/i2p/i2p.android.base
+POM_SCM_URL=https://github.com/i2p/i2p.android.base
+POM_SCM_CONNECTION=scm:git:git@github.com:i2p/i2p.android.base.git
+POM_SCM_DEV_CONNECTION=scm:git:git@github.com:i2p/i2p.android.base.git
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=github-ci
+POM_DEVELOPER_NAME=github-ci
+POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
+
+ANDROID_BUILD_TARGET_SDK_VERSION=33
+ANDROID_BUILD_SDK_VERSION=33
+
+I2P_VERSION=2.4.0
+I2P_ANDROID_VERSION=2.4.0
+android.disableAutomaticComponentCreation=true
+android.useAndroidX=true

etc/github.signing.properties

@@ -0,0 +1,2 @@
+STORE_FILE=/home/runner/keystores/android-release.keystore
+KEY_ALIAS=mykey

gradle.properties

@@ -17,7 +17,7 @@ POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
 ANDROID_BUILD_TARGET_SDK_VERSION=33
 ANDROID_BUILD_SDK_VERSION=33
 
-I2P_VERSION=2.4.0
-I2P_ANDROID_VERSION=2.4.0
+I2P_VERSION=2.5.1
+I2P_ANDROID_VERSION=2.5.1
 android.disableAutomaticComponentCreation=true
 android.useAndroidX=true