Compare commits
37 Commits
i2p-androi
...
i2p-androi
Author | SHA1 | Date | |
---|---|---|---|
18e4aef4ca | |||
5315e35adc | |||
9ad9bc07ff | |||
bde92be29d | |||
849150ffa6 | |||
52dad19c7a | |||
e84a51097d | |||
5289f5068a | |||
09c7d9cfd8 | |||
14d293fe6f | |||
7cd08cfd4c | |||
aa22d83a44 | |||
a1fd8d41b2 | |||
9d24e68b57 | |||
d5e2804ea4 | |||
1edabd7252 | |||
52c1901eba | |||
a6f5221975 | |||
caa57bbc3a | |||
b28e5d741e | |||
0f3a61390c | |||
30a1f1d800 | |||
22d5d126f6 | |||
70e4ea810f | |||
b5c6e1489a | |||
333a1a49b1 | |||
2ea93f106e | |||
d99ed0e5da | |||
3881966ddb | |||
9de9f46489 | |||
149881522e | |||
df26d89310 | |||
707dcbbc78 | |||
812aea9873 | |||
aeb7614b62 | |||
9bf9d27c5a | |||
f2cfe4cee5 |
73
.github/workflows/ant.yml
vendored
Normal file
73
.github/workflows/ant.yml
vendored
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
# Mostly copied from https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant
|
||||||
|
# zlatinb
|
||||||
|
|
||||||
|
name: Java CI
|
||||||
|
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
pages: write
|
||||||
|
id-token: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
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
|
||||||
|
run: |
|
||||||
|
rm -f override.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 assembleDebug
|
||||||
|
find . -name '*.apk'
|
||||||
|
- 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:
|
||||||
|
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
|
||||||
|
run: |
|
||||||
|
rm -f override.properties
|
||||||
|
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
|
||||||
|
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 assembleDebug
|
||||||
|
find . -name '*.apk'
|
||||||
|
- 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
|
62
.github/workflows/release.yml
vendored
Normal file
62
.github/workflows/release.yml
vendored
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
name: Release
|
||||||
|
|
||||||
|
#on: [push]
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
# Sequence of patterns matched against refs/tags
|
||||||
|
tags:
|
||||||
|
- 'i2p-android-*.*.*' # Release i2p-firefox-1.2.3
|
||||||
|
- 'i2p-android-*.*.*-*' # Release i2p-firefox-1.2.3
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
sparse-checkout: |
|
||||||
|
CHANGELOG.md
|
||||||
|
sparse-checkout-cone-mode: false
|
||||||
|
- name: sleep 6 minutes
|
||||||
|
run: |
|
||||||
|
echo "sleeping 6 minutes to wait for artifacts"
|
||||||
|
sleep 1m
|
||||||
|
echo "sleeping 5 minutes to wait for artifacts"
|
||||||
|
sleep 1m
|
||||||
|
echo "sleeping 4 minutes to wait for artifacts"
|
||||||
|
sleep 1m
|
||||||
|
echo "sleeping 3 minutes to wait for artifacts"
|
||||||
|
sleep 1m
|
||||||
|
echo "sleeping 2 minutes to wait for artifacts"
|
||||||
|
sleep 1m
|
||||||
|
echo "sleeping 1 minutes to wait for artifacts"
|
||||||
|
sleep 1m
|
||||||
|
- name: Download artifacts
|
||||||
|
id: download-artifact
|
||||||
|
uses: dawidd6/action-download-artifact@v3
|
||||||
|
with:
|
||||||
|
skip_unpack: true
|
||||||
|
workflow: ant.yml
|
||||||
|
if_no_artifact_found: fail
|
||||||
|
# remove .zip file extension
|
||||||
|
#- 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
|
||||||
|
- run: echo '```' | tee -a RELEASE.md
|
||||||
|
- run: sha256sum * | tee -a RELEASE.md
|
||||||
|
- run: echo '```' | tee -a RELEASE.md
|
||||||
|
- run: echo "" | tee -a RELEASE.md
|
||||||
|
- run: echo '```' | tee -a RELEASE.md
|
||||||
|
- run: file * | tee -a RELEASE.md
|
||||||
|
- run: echo '```' | tee -a RELEASE.md
|
||||||
|
- run: echo "" | tee -a RELEASE.md
|
||||||
|
- name: Upload artifacts
|
||||||
|
uses: ncipollo/release-action@v1
|
||||||
|
with:
|
||||||
|
artifacts: "*"
|
||||||
|
bodyFile: "RELEASE.md"
|
95
.github/workflows/sign.yml
vendored
Normal file
95
.github/workflows/sign.yml
vendored
Normal file
@ -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.4.0-1" >> gradle.properties.update
|
||||||
|
echo "I2P_ANDROID_VERSION=2.4.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
|
@ -8,7 +8,7 @@ repositories {
|
|||||||
android {
|
android {
|
||||||
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
|
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
versionCode 4745280
|
versionCode 4745281
|
||||||
versionName "$I2P_ANDROID_VERSION"
|
versionName "$I2P_ANDROID_VERSION"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
|
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
|
||||||
|
23
etc/github.gradle.properties
Normal file
23
etc/github.gradle.properties
Normal file
@ -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
|
2
etc/github.signing.properties
Normal file
2
etc/github.signing.properties
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
STORE_FILE=/home/runner/keystores/android-release.keystore
|
||||||
|
KEY_ALIAS=mykey
|
@ -17,7 +17,7 @@ POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
|
|||||||
ANDROID_BUILD_TARGET_SDK_VERSION=33
|
ANDROID_BUILD_TARGET_SDK_VERSION=33
|
||||||
ANDROID_BUILD_SDK_VERSION=33
|
ANDROID_BUILD_SDK_VERSION=33
|
||||||
|
|
||||||
I2P_VERSION=2.4.0
|
I2P_VERSION=2.5.0
|
||||||
I2P_ANDROID_VERSION=2.4.0
|
I2P_ANDROID_VERSION=2.5.0
|
||||||
android.disableAutomaticComponentCreation=true
|
android.disableAutomaticComponentCreation=true
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
Reference in New Issue
Block a user