Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,33 @@ jobs:
- name: Display java version
run: java -version

# ------------------------------------------------------------------
# Android SDK + NDK (Set NDK to at least 28 to support 16kb page size)
# ------------------------------------------------------------------
- name: Setup Android SDK & NDK
uses: android-actions/setup-android@v3
with:
packages: |
platforms;android-35
build-tools;35.0.0
ndk;28.2.13676358

- name: Export NDK environment
shell: bash
run: |
echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/28.2.13676358" >> $GITHUB_ENV
echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/28.2.13676358" >> $GITHUB_ENV

- name: Verify NDK
shell: bash
run: |
echo "NDK root: $ANDROID_NDK_ROOT"
ls "$ANDROID_NDK_ROOT"
"$ANDROID_NDK_ROOT/ndk-build.cmd" --version

# ------------------------------------------------------------------
# Native / Java build
# ------------------------------------------------------------------
- name: Build native dependencies
shell: cmd
run: |
Expand All @@ -89,27 +116,13 @@ jobs:
dotnet workload restore
cd ../..

- name: List apks
run: find . -type f -name "*.apk"
shell: bash


- name: Select the manifest
run: |
make manifestlink Flavor=${{ matrix.flavor }}

- name: List apks
run: find . -type f -name "*.apk"
shell: bash


- name: Install NuGet dependencies
run: make nuget Flavor=${{ matrix.flavor }}

- name: List apks
run: find . -type f -name "*.apk"
shell: bash

- name: Build APK (net)
env:
KeyStore: "${{ github.workspace }}/kp2a.keystore"
Expand All @@ -119,14 +132,9 @@ jobs:
DropboxAppSecret: ${{ secrets.DROPBOX_APP_SECRET }}
DropboxAppFolderAppKey: ${{ secrets.DROPBOX_APP_FOLDER_APP_KEY }}
DropboxAppFolderAppSecret: ${{ secrets.DROPBOX_APP_FOLDER_APP_SECRET }}

run: |
make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }}

- name: List apks
run: find . -type f -name "*.apk"
shell: bash


- name: Archive production artifacts
uses: actions/upload-artifact@v4
with:
Expand All @@ -135,10 +143,6 @@ jobs:
path: |
src/keepass2android-app/bin/Release/net9.0-android/publish/*.apk
src/keepass2android-app/bin/Release/net9.0-android/*/publish/*.apk

- name: List apks
run: find . -type f -name "*.apk"
shell: bash

- name: Rename apks
# after updating to .net9, the naming scheme of the output apks has changed. rename them to the old scheme
Expand All @@ -151,10 +155,6 @@ jobs:
mv "$apk" "$(dirname "$apk")/${base}-${arch#android-}.apk"
done
shell: bash

- name: List apks
run: find . -type f -name "*.apk"
shell: bash

- name: Upload APK to GitHub Release
uses: softprops/action-gh-release@v2
Expand Down
8 changes: 6 additions & 2 deletions src/java/KP2AKdbLibrary/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@ android {

namespace 'keepass2android.kp2akeytransform'

// Explicit NDK version used for ndk-build
ndkVersion "28.2.13676358"

compileSdk 34

defaultConfig {
ndk.abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
minSdkVersion 21
targetSdkVersion 34
compileSdk 34

ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
}

buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion src/java/KP2ASoftkeyboard_AS/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ android {

namespace 'keepass2android.softkeyboard'


ndkVersion "28.2.13676358"

defaultConfig {
minSdkVersion 21
Expand Down
9 changes: 0 additions & 9 deletions src/java/kp2akeytransform/.classpath

This file was deleted.

5 changes: 0 additions & 5 deletions src/java/kp2akeytransform/.gitignore

This file was deleted.

44 changes: 0 additions & 44 deletions src/java/kp2akeytransform/.project

This file was deleted.

30 changes: 0 additions & 30 deletions src/java/kp2akeytransform/AndroidManifest.xml

This file was deleted.

Loading
Loading