luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-04 20:30:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump target SDK to 30 and update dependencies

Browse source
This commit is contained in:
Alexander Bakker 2020-09-23 10:58:58 +02:00
parent 0af48f8bfa
commit cac13b082e
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/build.gradle
View file

@ -14,12 +14,12 @@ def getGitHash = { -> return getCmdOutput(["git", "rev-parse", "--short", "HEAD"
def getGitBranch = { -> return getCmdOutput(["git", "rev-parse", "--abbrev-ref", "HEAD"]) }
android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "com.beemdevelopment.aegis"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 30
versionCode 39
versionName "1.3"
multiDexEnabled true
@ -97,10 +97,10 @@ protobuf {
}
dependencies {
def cameraxVersion = '1.0.0-beta07'
def cameraxVersion = '1.0.0-beta11'
def glideVersion = '4.11.0'
def guavaVersion = '29.0'
def junitVersion = '5.6.2'
def guavaVersion = '30.0'
def junitVersion = '5.7.0'
def libsuVersion = '2.5.1'
annotationProcessor 'androidx.annotation:annotation:1.1.0'
@ -111,9 +111,9 @@ dependencies {
implementation "androidx.biometric:biometric:1.0.1"
implementation "androidx.camera:camera-camera2:$cameraxVersion"
implementation "androidx.camera:camera-lifecycle:$cameraxVersion"
implementation "androidx.camera:camera-view:1.0.0-alpha14"
implementation "androidx.camera:camera-view:1.0.0-alpha18"
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
implementation 'androidx.documentfile:documentfile:1.0.1'
implementation "androidx.lifecycle:lifecycle-process:2.2.0"
implementation 'androidx.preference:preference:1.1.1'
@ -131,25 +131,25 @@ dependencies {
implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
implementation "com.google.guava:guava:${guavaVersion}-android"
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.protobuf:protobuf-javalite:3.12.4'
implementation 'com.google.zxing:core:3.4.0'
implementation 'com.google.protobuf:protobuf-javalite:3.13.0'
implementation 'com.google.zxing:core:3.4.1'
implementation "com.mikepenz:iconics-core:3.2.5"
implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar'
implementation 'com.nulab-inc:zxcvbn:1.3.0'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0'
implementation 'net.lingala.zip4j:zip4j:2.6.1'
implementation 'net.lingala.zip4j:zip4j:2.6.4'
implementation 'org.bouncycastle:bcprov-jdk15on:1.65'
androidTestImplementation 'androidx.test:core:1.3.0-rc03'
androidTestImplementation 'androidx.test:runner:1.3.0-rc03'
androidTestImplementation 'androidx.test:rules:1.3.0-rc03'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
androidTestImplementation 'junit:junit:4.13'
androidTestUtil 'androidx.test:orchestrator:1.3.0-rc03'
androidTestImplementation 'androidx.test:core:1.3.0'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
androidTestImplementation 'junit:junit:4.13.1'
androidTestUtil 'androidx.test:orchestrator:1.3.0'
testImplementation "com.google.guava:guava:${guavaVersion}-jre"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"

2
app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
View file

@ -131,7 +131,7 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis
private void bindPreview(@NonNull ProcessCameraProvider cameraProvider) {
Preview preview = new Preview.Builder().build();
preview.setSurfaceProvider(_previewView.createSurfaceProvider());
preview.setSurfaceProvider(_previewView.getSurfaceProvider());
CameraSelector selector = new CameraSelector.Builder()
.requireLensFacing(_currentLens)

4
build.gradle
View file

@ -6,8 +6,8 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.13'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files