qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2203 from tenzap/009-updateAGPandGradle

Browse Source 
Java modules: upgrade Android gradle plugin & Gradle
This commit is contained in:
PhilippC
2023-01-28 21:02:53 +01:00
committed by GitHub
parent 5bdf93633f 91b59c7c9f
commit 50aec43b38
31 changed files with 107 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/build.yml vendored
View File

@@ -49,11 +49,10 @@ jobs:
# If using the github runner 'macos-10.15'
# $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2
- name: Switch to JDK-8
if: ${{ false }} # Not needed, we stay with the default installed JDK
- name: Switch to JDK-11
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '11'
distribution: 'temurin'
- name: Display java version
@@ -177,11 +176,10 @@ jobs:
sudo apt install -y ./xamarin.android-oss/*.deb &&
echo "$HOME/xamarin.android-oss/bin/Release/bin" >> $GITHUB_PATH
- name: Switch to JDK-8
if: ${{ false }} # Not needed, we stay with the default installed JDK
- name: Switch to JDK-11
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '11'
distribution: 'temurin'
- name: Display java version
@@ -279,6 +277,15 @@ jobs:
# 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
with:
java-version: '11'
distribution: 'temurin'
- name: Display java version
run: java -version
# Some components of Keepass2Android currently target android API 26 which are not available on the runner
- name: Download android-26 API
shell: cmd

29
src/java/JavaFileStorage/app/build.gradle
View File

@@ -1,8 +1,11 @@
apply plugin: 'com.android.library'
android {
namespace 'keepass2android.javafilestorage'
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 15
targetSdkVersion 28
@@ -27,27 +30,27 @@ NOTE: If you change dependencies here, don't forget to update the jar files in J
dependencies {
compile 'com.squareup.okhttp3:okhttp:4.10.0-RC1'
compile 'com.burgstaller:okhttp-digest:2.5'
implementation 'com.squareup.okhttp3:okhttp:4.10.0-RC1'
implementation 'com.burgstaller:okhttp-digest:2.5'
compile 'com.google.http-client:google-http-client-gson:1.20.0'
compile('com.google.api-client:google-api-client-android:1.30.5') {
implementation 'com.google.http-client:google-http-client-gson:1.20.0'
implementation('com.google.api-client:google-api-client-android:1.30.5') {
exclude group: 'com.google.android.google-play-services'
}
compile 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc'
compile 'com.dropbox.core:dropbox-core-sdk:4.0.0'
implementation 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc'
implementation 'com.dropbox.core:dropbox-core-sdk:4.0.0'
implementation 'com.google.api-client:google-api-client:1.30.5'
implementation 'com.google.api-client:google-api-client-android:1.30.5'
implementation 'com.google.android.gms:play-services-auth:20.4.0'
//onedrive:
compile('com.onedrive.sdk:onedrive-sdk-android:1.2.0') {
implementation('com.onedrive.sdk:onedrive-sdk-android:1.2.0') {
transitive = false
}
compile 'com.pcloud.sdk:java-core:1.2.0'
compile 'com.pcloud.sdk:android:1.2.0'
compile 'com.google.code.gson:gson:2.8.6'
compile 'com.microsoft.services.msa:msa-auth:0.8.6'
compile 'com.microsoft.aad:adal:1.14.0'
implementation 'com.pcloud.sdk:java-core:1.2.0'
implementation 'com.pcloud.sdk:android:1.2.0'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.microsoft.services.msa:msa-auth:0.8.6'
implementation 'com.microsoft.aad:adal:1.14.0'
}

6
src/java/JavaFileStorage/app/src/main/AndroidManifest.xml
View File

@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="keepass2android.javafilestorage"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk
android:targetSdkVersion="14" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -17,4 +13,4 @@
android:label="Keepass2Android"></activity>
</application>
</manifest>
</manifest>

11
src/java/JavaFileStorage/build.gradle
View File

@@ -1,20 +1,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
mavenCentral()
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath "com.android.tools.build:gradle:7.4.0"
}
}
allprojects {
repositories {
google()
mavenCentral()
jcenter()
google()
}
}

2
src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

12
src/java/JavaFileStorageTest-AS/app/build.gradle
View File

@@ -1,13 +1,14 @@
apply plugin: 'com.android.application'
android {
namespace "com.crocoapps.javafilestoragetest2"
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "com.crocoapps.javafilestoragetest2"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 31
versionCode 1
versionName "1.0"
multiDexEnabled true
@@ -31,10 +32,11 @@ android {
//apply plugin: 'com.getkeepsafe.dexcount'
dependencies {
compile project(':android-filechooser')
compile project(':JavaFileStorage')
implementation project(':android-filechooser')
implementation project(':JavaFileStorage')
implementation "androidx.annotation:annotation:1.5.0"
}
configurations {
compile.exclude group: "org.apache.httpcomponents", module: "httpclient"
implementation.exclude group: "org.apache.httpcomponents", module: "httpclient"
}

12
src/java/JavaFileStorageTest-AS/app/src/main/AndroidManifest.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.crocoapps.javafilestoragetest2">
xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
@@ -9,7 +8,8 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name="com.crocoapps.javafilestoragetest2.MainActivity">
<activity android:name="com.crocoapps.javafilestoragetest2.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -49,6 +49,7 @@
</activity>
<activity
android:name="com.dropbox.core.android.AuthActivity"
android:exported="true"
android:configChanges="orientation|keyboard"
android:launchMode="singleTask" >
<intent-filter>
@@ -63,7 +64,8 @@
</activity>
<activity
android:name="com.microsoft.identity.client.BrowserTabActivity">
android:name="com.microsoft.identity.client.BrowserTabActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
@@ -86,4 +88,4 @@
</manifest>
</manifest>

11
src/java/JavaFileStorageTest-AS/build.gradle
View File

@@ -2,14 +2,12 @@
buildscript {
repositories {
google()
mavenCentral()
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath "com.android.tools.build:gradle:7.4.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -20,8 +18,9 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
mavenCentral()
jcenter()
}
}

2
src/java/JavaFileStorageTest-AS/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

4
src/java/KP2AKdbLibrary/app/build.gradle
View File

@@ -1,8 +1,10 @@
apply plugin: 'com.android.library'
android {
namespace 'keepass2android.kp2akeytransform'
compileSdkVersion 23
buildToolsVersion '28.0.3'
defaultConfig {
ndk.abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'

3
src/java/KP2AKdbLibrary/app/src/main/AndroidManifest.xml
View File

@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="keepass2android.kp2akeytransform"
android:versionCode="1"
android:versionName="1.0" >
@@ -7,4 +6,4 @@
<application>
</application>
</manifest>
</manifest>

14
src/java/KP2AKdbLibrary/build.gradle
View File

@@ -1,25 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
google()
maven {
url 'https://maven.google.com/'
name 'Google'
}
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath "com.android.tools.build:gradle:7.4.0"
}
}
allprojects {
repositories {
jcenter()
google()
maven {
url 'https://maven.google.com/'
name 'Google'
}
mavenCentral()
}
}

2
src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

4
src/java/KP2ASoftkeyboard_AS/app/build.gradle
View File

@@ -1,7 +1,9 @@
apply plugin: 'com.android.library'
android {
namespace 'keepass2android.softkeyboard'
compileSdkVersion 23
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 18

4
src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="keepass2android.softkeyboard">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-sdk android:targetSdkVersion="14"/>
<application
android:killAfterRestore="false">

15
src/java/KP2ASoftkeyboard_AS/build.gradle
View File

@@ -1,24 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:4.0.1"
classpath "com.android.tools.build:gradle:7.4.0"
}
}
allprojects {
repositories {
google()
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
mavenCentral()
}
}

2
src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

4
src/java/Keepass2AndroidPluginSDK2/app/build.gradle
View File

@@ -1,7 +1,9 @@
apply plugin: 'com.android.library'
android {
namespace 'keepass2android.pluginsdk'
compileSdkVersion 23
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 8

1
src/java/Keepass2AndroidPluginSDK2/app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="keepass2android.pluginsdk"
android:versionCode="1"
android:versionName="1.0" >

11
src/java/Keepass2AndroidPluginSDK2/build.gradle
View File

@@ -2,14 +2,11 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "com.android.tools.build:gradle:7.4.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -20,8 +17,8 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
mavenCentral()
}
}

2
src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

8
src/java/PluginQR/app/build.gradle
View File

@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
namespace 'keepass2android.plugin.qr'
compileSdkVersion 26
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "keepass2android.plugin.qr"
minSdkVersion 14
targetSdkVersion 19
targetSdkVersion 31
versionCode 3
versionName "1.0.2"
}
@@ -32,6 +32,6 @@ android {
}
dependencies {
compile project(':Keepass2AndroidPluginSDK2')
compile 'com.google.zxing:core:2.3.0'
implementation project(':Keepass2AndroidPluginSDK2')
implementation 'com.google.zxing:core:2.3.0'
}

5
src/java/PluginQR/app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="keepass2android.plugin.qr" >
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission
@@ -20,6 +19,7 @@
android:theme="@style/AppTheme" >
<activity
android:name="keepass2android.plugin.qr.QRActivity"
android:exported="true"
android:label="@string/title_activity_qr" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -47,6 +47,7 @@
<activity
android:name="keepass2android.plugin.qr.MainActivity"
android:exported="true"
android:label="@string/app_name"
>
<intent-filter>

12
src/java/PluginQR/build.gradle
View File

@@ -1,19 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath "com.android.tools.build:gradle:7.4.0"
}
}
allprojects {
repositories {
jcenter()
google()
mavenCentral()
}
}

2
src/java/PluginQR/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

6
src/java/android-filechooser-AS/app/build.gradle
View File

@@ -1,8 +1,10 @@
apply plugin: 'com.android.library'
android {
namespace 'group.pals.android.lib.ui.filechooser'
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 16
@@ -23,5 +25,5 @@ android {
}
dependencies {
compile 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
}

5
src/java/android-filechooser-AS/app/src/main/AndroidManifest.xml
View File

@@ -6,8 +6,7 @@
permission.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="group.pals.android.lib.ui.filechooser" >
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
</manifest>

11
src/java/android-filechooser-AS/build.gradle
View File

@@ -2,14 +2,11 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath "com.android.tools.build:gradle:7.4.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -20,8 +17,8 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
mavenCentral()
}
}

3
src/java/android-filechooser-AS/gradle.properties
View File

@@ -1 +1,2 @@
org.gradle.jvmargs=-Xmx1024m
org.gradle.jvmargs=-Xmx1024m
android.useAndroidX=true

2
src/java/android-filechooser-AS/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

0
src/java/android-filechooser-AS/gradlew vendored Normal file → Executable file
View File