Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libs and tools #2692

Merged
merged 23 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
51902c9
fix build issues related to removal of deprecated OneDrive API jars. …
PhilippC Oct 8, 2024
73a8ec2
remove no-longer-needed jars from JavaFileStorageBindings
PhilippC Oct 8, 2024
f0fd21a
upgrade to Gradle version 8.6 (plugin version 8.4)
PhilippC Oct 8, 2024
669022d
update Newtonsoft.Json, FluentFTP and MegaApiClient to the latest ver…
PhilippC Oct 8, 2024
5ae718c
update targetframework for Guava libs
PhilippC Oct 8, 2024
4b55e2c
Bump checkout from v3 to v4
anttiharju Oct 13, 2024
a54444e
Bump gradle-build-action to v3
anttiharju Oct 13, 2024
84230b3
Bump gradle/actions/setup-gradle to v4
anttiharju Oct 13, 2024
247b372
Bump actions/cache to v4
anttiharju Oct 13, 2024
8bde5ed
Use actions/checkout for fetching submodules
anttiharju Oct 13, 2024
177b1fc
Update al-cheb/configure-pagefile-action to v1.4
anttiharju Oct 13, 2024
38e305b
Pin a third-party action
anttiharju Oct 13, 2024
5882263
Bump microsoft/setup-msbuild to v2 for node20
anttiharju Oct 13, 2024
8d354bb
Update actions/setup-java to v4
anttiharju Oct 13, 2024
7dcccf1
Bump artifact actions to v4
anttiharju Oct 13, 2024
e464c59
Downgrade setup-gradle to v3
anttiharju Oct 15, 2024
65092dc
Switch okhttp-digest source to github
anttiharju Oct 15, 2024
a98cd33
updating OkHttp, okhttp-digest and dropbox sdk. Removing no longer ne…
PhilippC Oct 22, 2024
9494f28
Merge branch 'anttiharju/master' into update-libs-and-tools
PhilippC Oct 22, 2024
b2b0b8d
switch to Java 17 in build.yml
PhilippC Oct 22, 2024
dad9b0e
update minSdk of offline version to 21 (Android 5.0) to simplify the …
PhilippC Oct 22, 2024
6e30dd3
Prevent duplicate runs in PRs
anttiharju Dec 20, 2024
8304948
Merge pull request #2734 from anttiharju/prevent-duplicate-CI-runs
PhilippC Dec 31, 2024
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
67 changes: 34 additions & 33 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Build keepass2android app

on: [push, pull_request]
on:
push:
branches:
- main
pull_request:

jobs:
# macos:
Expand All @@ -10,16 +14,15 @@ jobs:
# runs-on: macos-12

# steps:
# - uses: actions/checkout@v3

# - name: Fetch submodules
# run: git submodule init && git submodule update
# - uses: actions/checkout@v4
# with:
# submodules: true

# - name: Setup Gradle
# uses: gradle/gradle-build-action@v2
# uses: gradle/actions/setup-gradle@v3

# - name: Cache NuGet packages
# uses: actions/cache@v3
# uses: actions/cache@v4
# with:
# path: ~/.nuget/packages
# key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
Expand Down Expand Up @@ -52,7 +55,7 @@ jobs:
# # $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2

# - name: Switch to JDK-11
# uses: actions/setup-java@v3
# uses: actions/setup-java@v4
# with:
# java-version: '11'
# distribution: 'temurin'
Expand Down Expand Up @@ -82,7 +85,7 @@ jobs:
# make apk Flavor=Net

# - name: Archive production artifacts (net)
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: signed APK ('net' built on ${{ github.job }})
# path: |
Expand All @@ -100,7 +103,7 @@ jobs:
# make apk Flavor=NoNet

# - name: Archive production artifacts (nonet)
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: signed APK ('nonet' built on ${{ github.job }})
# path: |
Expand Down Expand Up @@ -130,16 +133,15 @@ jobs:
# # Build Artifact of xamarin.android-oss dated 2022-02-16, master branch (= version 12.2.99)
# xamarin_url: https://artprodcus3.artifacts.visualstudio.com/Ad0adf05a-e7d7-4b65-96fe-3f3884d42038/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL3hhbWFyaW4vcHJvamVjdElkLzZmZDNkODg2LTU3YTUtNGUzMS04ZGI3LTUyYTFiNDdjMDdhOC9idWlsZElkLzU0OTUzL2FydGlmYWN0TmFtZS9pbnN0YWxsZXJzLXVuc2lnbmVkKy0rTGludXg1/content?format=zip
# steps:
# - uses: actions/checkout@v3

# - name: Fetch submodules
# run: git submodule init && git submodule update
# - uses: actions/checkout@v4
# with:
# submodules: true

# - name: Setup Gradle
# uses: gradle/gradle-build-action@v2
# uses: gradle/actions/setup-gradle@v3

# - name: Cache NuGet packages
# uses: actions/cache@v3
# uses: actions/cache@v4
# with:
# path: ~/.nuget/packages
# key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
Expand All @@ -148,7 +150,7 @@ jobs:

# - name: Cache Xamarin.Android packages
# id: xamarin_cache
# uses: actions/cache@v3
# uses: actions/cache@v4
# with:
# path: ~/xamarin.android-oss
# key: ${{ runner.os }}-xamarin.android-oss-${{ env.xamarin_url }}
Expand Down Expand Up @@ -183,7 +185,7 @@ jobs:
# echo "$HOME/xamarin.android-oss/bin/Release/bin" >> $GITHUB_PATH

# - name: Switch to JDK-11
# uses: actions/setup-java@v3
# uses: actions/setup-java@v4
# with:
# java-version: '11'
# distribution: 'temurin'
Expand Down Expand Up @@ -217,7 +219,7 @@ jobs:
# make apk Flavor=Net

# - name: Archive production artifacts (net)
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: signed APK ('net' built on ${{ github.job }})
# path: |
Expand All @@ -235,7 +237,7 @@ jobs:
# make apk Flavor=NoNet

# - name: Archive production artifacts (nonet)
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: signed APK ('nonet' built on ${{ github.job }})
# path: |
Expand All @@ -254,39 +256,38 @@ jobs:
runs-on: windows-2022

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3

- name: Cache NuGet packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
restore-keys: |
${{ runner.os }}-nuget-

- name: Fetch submodules
run: git submodule init && git submodule update

# Workaround an issue when building on windows-2022. Error was
# D8 : OpenJDK 64-Bit Server VM warning : INFO: os::commit_memory(0x00000000ae400000, 330301440, 0) failed; error='The paging file is too small for this operation to complete' (DOS error/errno=1455) [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
# C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Xamarin\Android\Xamarin.Android.D8.targets(81,5): error MSB6006: "java.exe" exited with code 1. [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
- name: Configure Pagefile
uses: al-cheb/configure-pagefile-action@v1.3
uses: al-cheb/configure-pagefile-action@a3b6ebd6b634da88790d9c58d4b37a7f4a7b8708 # v1.4
with:
minimum-size: 8GB

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
uses: microsoft/setup-msbuild@v2
# If we want to also have nmake, use this instead
#uses: ilammy/msvc-dev-cmd@v1

- name: Switch to JDK-11
uses: actions/setup-java@v3
- name: Switch to JDK-17
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'

- name: Display java version
Expand Down Expand Up @@ -320,7 +321,7 @@ jobs:
make apk Flavor=Net

- name: Archive production artifacts (net)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: signed APK ('net' built on ${{ github.job }})
path: |
Expand All @@ -341,7 +342,7 @@ jobs:
make apk Flavor=NoNet

- name: Archive production artifacts (nonet)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: signed APK ('nonet' built on ${{ github.job }})
path: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,4 @@ src/java/Keepass2AndroidPluginSDK2/build/generated/mockable-Google-Inc.-Google-A
/src/ActionViewFilterTest
/docs/gdrive-verification
/src/MegaTest
*.dtbcache.json
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/JavaFileStorageBindings/Jars/msa-auth-0.8.6.aar
Binary file not shown.

This file was deleted.

1 change: 0 additions & 1 deletion src/JavaFileStorageBindings/Jars/msa-auth-0.8.6/R.txt

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/JavaFileStorageBindings/Jars/okio-2.9.0.jar
Binary file not shown.
Binary file added src/JavaFileStorageBindings/Jars/okio-3.6.0.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

22 changes: 0 additions & 22 deletions src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2/R.txt

This file was deleted.

This file was deleted.

Binary file not shown.
Loading
Loading