Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release7' into 'master' 

Release 7

See merge request pixeldroid/PixelDroid!414
This commit is contained in:
Matthieu 2022-01-23 13:23:36 +00:00
parent 35bdccf214 d6761c77d1
commit 0f71f939cd
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/build.gradle
View File

@ -28,8 +28,8 @@ android {
applicationId "org.pixeldroid.app" applicationId "org.pixeldroid.app"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 31
versionCode 6 versionCode 7
versionName "1.0.beta6" versionName "1.0.beta7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'
@ -106,10 +106,10 @@ dependencies {
/** /**
* AndroidX dependencies: * AndroidX dependencies:
*/ */
implementation 'androidx.appcompat:appcompat:1.4.0' implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.preference:preference-ktx:1.1.1' implementation 'androidx.preference:preference-ktx:1.1.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2' implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
implementation "androidx.browser:browser:1.4.0" implementation "androidx.browser:browser:1.4.0"
@ -137,12 +137,13 @@ dependencies {
implementation "androidx.camera:camera-lifecycle:$cameraX_version" implementation "androidx.camera:camera-lifecycle:$cameraX_version"
// CameraX View class // CameraX View class
implementation 'androidx.camera:camera-view:1.0.0-alpha31' implementation 'androidx.camera:camera-view:1.0.0-alpha32'
def room_version = "2.3.0" def room_version = "2.4.1"
implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version" kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version" implementation "androidx.room:room-ktx:$room_version"
implementation "androidx.room:room-paging:$room_version"
/** /**
* End of AndroidX section * End of AndroidX section
@ -150,7 +151,7 @@ dependencies {
*/ */
implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.android.material:material:1.5.0'
//Dagger (dependency injection) //Dagger (dependency injection)
implementation 'com.google.dagger:dagger-android:2.40.5' implementation 'com.google.dagger:dagger-android:2.40.5'

6
app/licenses.yml
View File

@ -847,3 +847,9 @@
license: The Apache Software License, Version 2.0 license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/jetpack/androidx/releases/resourceinspection#1.0.0 url: https://developer.android.com/jetpack/androidx/releases/resourceinspection#1.0.0
- artifact: androidx.room:room-paging:+
name: room-paging
copyrightHolder: Google Inc
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/jetpack/androidx/releases/room#2.4.1

2
app/src/main/assets/licenses.json
View File

File diff suppressed because one or more lines are too long

2
fastlane/metadata/android/en-US/changelogs/7.txt Normal file
View File

@ -0,0 +1,2 @@
* Translation updates
* Allow remote images in upload (e.g. Nextcloud)