Skip to content

Commit 96b5100

Browse files
committed
Merge branch 'update-dependencies'
2 parents a740254 + 2953b60 commit 96b5100

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

app/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ android {
2626
v2SigningEnabled true
2727
}
2828
}
29-
compileSdkVersion 32
29+
compileSdkVersion 33
3030
buildToolsVersion '30.0.3'
3131
defaultConfig {
3232
applicationId "es.wolfi.app.passman"
3333
minSdkVersion 21
34-
targetSdkVersion 32
34+
targetSdkVersion 33
3535
versionCode 16
3636
versionName "1.4.0"
3737
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -98,6 +98,7 @@ android {
9898
disable 'MissingTranslation'
9999
}
100100
ndkVersion '21.4.7075529'
101+
namespace 'es.wolfi.app.passman'
101102
}
102103

103104
dependencies {
@@ -109,7 +110,7 @@ dependencies {
109110
implementation "com.github.nextcloud:Android-SingleSignOn:0.6.1"
110111

111112
implementation 'androidx.appcompat:appcompat:1.4.1'
112-
implementation 'com.google.android.material:material:1.6.1'
113+
implementation 'com.google.android.material:material:1.8.0'
113114
implementation 'com.jakewharton:butterknife:10.2.3'
114115
implementation 'com.koushikdutta.ion:ion:3.1.0'
115116
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -122,10 +123,10 @@ dependencies {
122123
implementation 'com.vdurmont:semver4j:3.1.0'
123124
// Version 3.4.0 contains a crashing bug before api level 24
124125
implementation 'com.google.zxing:core:3.3.3'
125-
implementation("androidx.camera:camera-core:1.1.0")
126-
implementation("androidx.camera:camera-camera2:1.1.0")
127-
implementation("androidx.camera:camera-lifecycle:1.1.0")
128-
implementation("androidx.camera:camera-view:1.1.0")
126+
implementation("androidx.camera:camera-core:1.2.1")
127+
implementation("androidx.camera:camera-camera2:1.2.1")
128+
implementation("androidx.camera:camera-lifecycle:1.2.1")
129+
implementation("androidx.camera:camera-view:1.2.1")
129130
testImplementation 'junit:junit:4.13.2'
130131
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
131132
}

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="es.wolfi.app.passman">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.INTERNET" />
65
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -13,7 +12,7 @@
1312
</queries>
1413

1514
<application
16-
android:allowBackup="true"
15+
android:allowBackup="false"
1716
android:hardwareAccelerated="true"
1817
android:icon="@mipmap/ic_launcher"
1918
android:label="@string/app_name"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
dependencies {
99
apply plugin: 'maven-publish'
10-
classpath 'com.android.tools.build:gradle:7.1.2'
10+
classpath 'com.android.tools.build:gradle:7.4.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Mar 22 14:20:29 GMT 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)