Commit Graph

4086 Commits

Author SHA1 Message Date
PhilippC
f1fdfa5205 Update README.md 2023-01-30 08:09:34 +01:00
Philipp Crocoll
c1f7460c3e disable linux runner, currently not supported 2023-01-30 08:00:36 +01:00
PhilippC
50aec43b38 Merge pull request #2203 from tenzap/009-updateAGPandGradle
Java modules: upgrade Android gradle plugin & Gradle
2023-01-28 21:02:53 +01:00
tenzap
91b59c7c9f github workflow: switch to JDK 11
Since Android Gradle plugin was updated, it now requires JDK 11.

Fixes:

> Could not resolve all files for configuration ':classpath'.
   > Could not resolve com.android.tools.build:gradle:7.4.0.
     Required by:
         project :
      > No matching variant of com.android.tools.build:gradle:7.4.0 was found. The consumer was configured to find a runtime of a library compatible with Java 8, packaged as a jar, and its dependencies declared externally, as well as attribute 'org.gradle.plugin.api-version' with value '7.6' but:
          - Variant 'apiElements' capability com.android.tools.build:gradle:7.4.0 declares a library, packaged as a jar, and its dependencies declared externally:
              - Incompatible because this component declares an API of a component compatible with Java 11 and the consumer needed a runtime of a component compatible with Java 8
              - Other compatible attribute:
                  - Doesn't say anything about org.gradle.plugin.api-version (required '7.6')
2023-01-26 22:02:25 +01:00
tenzap
e42b4c9654 Java modules: update repository sources 2023-01-26 22:02:09 +01:00
tenzap
d6486d4b98 Java modules: Upgrade to AGP 7.4.0 & Gradle 7.6
Fix the issues that were reported because of that change:

WARNING:The specified Android SDK Build Tools version (28.0.3) is ignored, as it is below the minimum supported version (30.0.3) for Android Gradle Plugin 7.4.0.
Android SDK Build Tools 30.0.3 will be used.
To suppress this warning, remove "buildToolsVersion '28.0.3'" from your build.gradle file, as each version of the Android Gradle Plugin now has a default version of the build tools.

android:exported needs to be explicitly specified for element <activity#com.crocoapps.javafilestoragetest2.MainActivity>. Apps targeting Android 12 and higher are required to specify an explicit value for `android:exported` when the corresponding component has an intent filter defined. See https://developer.android.com/guide/topics/manifest/activity-element#exported for details.

Setting the namespace via a source AndroidManifest.xml's package attribute is deprecated.
Please instead set the namespace (or testNamespace) in the module's build.gradle file, as described here: https://developer.android.com/studio/build/configure-app-module#set-namespace
This migration can be done automatically using the AGP Upgrade Assistant, please refer to https://developer.android.com/studio/build/agp-upgrade-assistant for more information.

.../keepass2android/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml:5:5-46 Warning:
	uses-sdk:targetSdkVersion value (14) specified in the manifest file is ignored. It is overridden by the value declared in the DSL or the variant API, or 1 if not declared/present. Current value is (18).
2023-01-26 22:02:02 +01:00
PhilippC
5bdf93633f Merge pull request #2200 from tenzap/007-ci
Fix github workflow
2023-01-26 20:17:30 +01:00
tenzap
7ba6a44888 github workflow: restore download of 'platforms;android-26'
Some targets still target v8.0 (api26):

src/KeePassLib2Android/KeePassLib2Android.csproj:    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj:    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
src/ZlibAndroid/ZlibAndroid.csproj:    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
src/PluginSdkBinding/PluginSdkBinding.csproj:    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
src/PCloudBindings/PCloudBindings.csproj:    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj:    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
src/TwofishCipher/TwofishCipher.csproj:    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>

So we need it in ANDROID_SDK_ROOT.

Otherwise build fails with this error (on macos & windows):

C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Xamarin\Android\Xamarin.Android.Tooling.targets(100,5): error XA5207: Could not find android.jar for API level 26. This means the Android SDK platform for API level 26 is not installed. Either install it in the Android SDK Manager (Tools > Android > Android SDK Manager...), or change the Xamarin.Android project to target an API version that is installed. (C:\Android\android-sdk\platforms\android-26\android.jar missing.) [D:\a\keepass2android\keepass2android\src\TwofishCipher\TwofishCipher.csproj]
2023-01-25 09:16:31 +01:00
tenzap
187d4c8f41 github workflow: fix typo 2023-01-25 09:13:41 +01:00
tenzap
58b0b666ce github workflow: restore download of xamarin.android only if it isn't in cache 2023-01-25 09:13:22 +01:00
tenzap
8393694e6c github workflow: restore 'Setup Xamarin.Android' step 2023-01-25 09:11:24 +01:00
tenzap
b99f82d3d7 github workflow: remove 'Install NDK' step
Not needed and I believe nowadays we should use the sdkmanager or cmdline-tools/latest/bin
2023-01-25 09:10:22 +01:00
tenzap
dfbfeb3fa3 remove ndk version specified in KP2ASoftkeyboard_AS/app/build.gradle
Partially reverts 4b3f6657a8
2023-01-25 09:08:11 +01:00
tenzap
3c9a8341ae github workflow: use gradle/gradle-build-action@v2 to manage gradle cache
Should be better than the custom way we used and manages the lock
made on windows runners
2023-01-25 09:06:52 +01:00
Philipp Crocoll
8f69a60307 remove gradle caching on Windows as well 2023-01-24 20:55:37 +01:00
Philipp Crocoll
14c2e64e2f disable gradle cache 2023-01-24 20:50:52 +01:00
Philipp Crocoll
554338012e now really remove install workload 2023-01-24 19:57:16 +01:00
Philipp Crocoll
3185cf1a9c re-enable download of xamarin build tools for linux 2023-01-24 19:43:54 +01:00
Philipp Crocoll
ed91d0db0b fix syntax error 2023-01-24 19:36:10 +01:00
Philipp Crocoll
dd7cb0a088 enable usage of xamarin_url for linux again 2023-01-24 19:31:01 +01:00
Philipp Crocoll
874e1dbae8 remove download of xamarin-33 2023-01-24 19:22:52 +01:00
Philipp Crocoll
649c0739f6 github action: install ndk for windows also, use "workload install" on linux 2023-01-23 20:39:17 +01:00
Philipp Crocoll
3db5ea4713 fix syntax error 2023-01-23 12:53:07 +01:00
Philipp Crocoll
96b5e1c10e install NDK 21.0.6113669 on github workflow runner 2023-01-23 12:41:14 +01:00
Philipp Crocoll
2bf5222505 update github workflow to use Visual studio 2022 and Xamarin for target sdk 33 2023-01-23 12:15:28 +01:00
Philipp Crocoll
24d6909297 changes to make build succeed for Flavor=Net as well 2023-01-23 11:30:41 +01:00
Philipp Crocoll
1c3f4106dd fix to weird autofill behavior: now returning dataset directly, instead of responseBuilder with dataset, allowing to fill the result of the autofill activity immediately. 2023-01-23 10:11:28 +01:00
Philipp Crocoll
4b3f6657a8 * update target-sdk version to 33. update some packages (build currently fails for flavor=Net, but works with NoNet)
* make changes to comply with new target sdk version requirements (mostly Exported-attribute and mutability flags)
* drop samsung fingerprint support (as suggested by Samsung), would require more hacks to keep it with the new target sdk version
* add build-properties.props to allow specifying a flavor in VS builds.
2023-01-23 10:07:15 +01:00
Philipp Crocoll
f6e6d0e59c update changelog to include 1.09e 2023-01-09 10:58:36 +01:00
PhilippC
30c1cc1e3f Merge pull request #2183 from PhilippC/l10n_master2
New Crowdin updates
2023-01-09 10:00:22 +01:00
PhilippC
e7f579862f New translations strings.xml (Chinese Simplified) 2023-01-08 04:03:15 +01:00
PhilippC
22fc984432 New translations strings.xml (German) 2023-01-07 23:26:13 +01:00
Philipp Crocoll
33b3c78676 Merge branch 'master' of https://github.com/PhilippC/keepass2android 2023-01-07 21:01:08 +01:00
Philipp Crocoll
0052641b86 pseudo-change to trigger crowdin sync once again 2023-01-07 21:00:57 +01:00
PhilippC
b5b67ed6c4 Merge pull request #2181 from PhilippC/l10n_master2
New Crowdin updates
2023-01-07 20:59:48 +01:00
PhilippC
08e0b6e72d New translations strings.xml (Persian) 2023-01-05 08:51:01 +01:00
PhilippC
6e23b1ef22 New translations strings.xml (Japanese) 2023-01-05 08:50:50 +01:00
PhilippC
e0da7c6bf5 New translations strings.xml (Serbian (Cyrillic)) 2023-01-05 08:50:28 +01:00
Philipp Crocoll
138bd8adef changelog entries for 1.09e 2023-01-04 23:20:58 +01:00
PhilippC
ab527368c0 Merge pull request #2179 from PhilippC/makefile-signing
allow to sign apk using a specific keystore
2023-01-04 23:04:19 +01:00
PhilippC
335c53360d Merge pull request #2142 from nikoyak/fix-1956
fix crashes/unexpected logouts (#1956, #1936, #1909)
2023-01-04 22:23:31 +01:00
PhilippC
7b31f6ec5a Merge pull request #2176 from sratz/jsch
Migrate from com.jcraft:jsch 0.1.55 to com.github.mwiede:jsch 0.2.5
2023-01-04 22:21:36 +01:00
Philipp Crocoll
63a8791752 allow to sign apk using a specific keystore 2023-01-04 21:50:06 +01:00
Sebastian Ratz
e3ce7fe95a Migrate from com.jcraft:jsch 0.1.55 to com.github.mwiede:jsch 0.2.5
com.jcraft:jsch is not actively maintained anymore and lacks support
for modern public key algorithms such as rsa-sha2-256. It only
supports ssh-rsa which is disabled in up-to-date environments.

com.github.mwiede:jsch was created as a drop-in replacement which
works in modern environments [1].

Sources are taken from maven central [2]. The following files were
omitted, because they depend on additional 3rd-party libraries which
we do not have / do not need:

    com/jcraft/jsch/JUnixSocketFactory.java
    com/jcraft/jsch/Log4j2Logger.java
    com/jcraft/jsch/PageantConnector.java
    com/jcraft/jsch/Slf4jLogger.java
    com/jcraft/jsch/SSHAgentConnector.java
    com/jcraft/jsch/bc/*
    com/jcraft/jsch/jgss/GSSContextKrb5.java

Fixes #1812.

[1] https://github.com/mwiede/jsch
[2] https://repo1.maven.org/maven2/com/github/mwiede/jsch/0.2.5/jsch-0.2.5-sources.jar
2023-01-03 15:26:42 +01:00
PhilippC
ce6556496e Merge pull request #2159 from tenzap/003-makefile_java
Makefile: add more source files to deps for java targets
2023-01-03 10:13:48 +01:00
PhilippC
eab5e22c8c Merge pull request #2162 from tenzap/004-gitignore
Fix gitignore with Resource.designer.cs/Resource.Designer.cs
2023-01-03 10:13:06 +01:00
PhilippC
827905e690 Merge pull request #2163 from tenzap/005-nuget.packages
remove src/.nuget/packages.config
2023-01-03 10:12:25 +01:00
PhilippC
7fe407d25e Merge pull request #2164 from tenzap/006-removeUntracked
remove untracked files as per .gitignore
2023-01-03 10:11:49 +01:00
nikoyak
b9d0f56e0f Revert "avoid potential crash in Android 12 while reloading the Database, closes https://github.com/PhilippC/keepass2android/issues/1909"
This reverts commit 40146a42ce,
because the root problem is fixed.
2022-12-20 11:42:31 +03:00
nikoyak
5d06a8b62a fix #1956, #1936, #1909 2022-12-20 11:33:51 +03:00