cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update parts of toolchain and dependencies

Browse Source
This commit is contained in:
Vincent Breitmoser
2022-12-22 15:50:26 +01:00
parent 8e4b248acf
commit a17a6e9131
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/build.gradle
View File

@@ -4,11 +4,13 @@ apply plugin: 'com.squareup.sqldelight'
dependencies { dependencies {
// from local Android SDK // from local Android SDK
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.annotation:annotation:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.sqlite:sqlite-framework:2.2.0'
implementation 'com.google.android.material:material:1.6.1'
// JCenter etc. // JCenter etc.
implementation 'com.journeyapps:zxing-android-embedded:3.4.0' implementation 'com.journeyapps:zxing-android-embedded:3.4.0'
@@ -79,9 +81,6 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0' annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0'
implementation 'androidx.sqlite:sqlite-framework:2.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
// for debugging the db. don't enable by default, this will expose the database no the network! // for debugging the db. don't enable by default, this will expose the database no the network!
// debugImplementation 'com.amitshekhar.android:debug-db:1.0.3' // debugImplementation 'com.amitshekhar.android:debug-db:1.0.3'
} }

4
build.gradle
View File

@@ -6,7 +6,7 @@ buildscript {
dependencies { dependencies {
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
classpath 'com.android.tools.build:gradle:4.1.2' classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.squareup.sqldelight:gradle-plugin:0.8.0' classpath 'com.squareup.sqldelight:gradle-plugin:0.8.0'
} }
} }
@@ -23,5 +23,5 @@ allprojects {
// SDK Version and Build Tools used by all subprojects // SDK Version and Build Tools used by all subprojects
// See http://tools.android.com/tech-docs/new-build-system/tips#TOC-Controlling-Android-properties-of-all-your-modules-from-the-main-project. // See http://tools.android.com/tech-docs/new-build-system/tips#TOC-Controlling-Android-properties-of-all-your-modules-from-the-main-project.
ext { ext {
compileSdkVersion = 29 compileSdkVersion = 33
} }