Pixelfed/PixelDroid-App-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Matthieu 2024-11-30 22:27:57 +01:00
parent 2f50ecaf03
commit c5351c7fd4
5 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/build.gradle
View File

@ -27,7 +27,7 @@ android.applicationVariants.configureEach { variant ->
android {
namespace 'org.pixeldroid.app'
compileSdk 34
compileSdk 35
compileOptions {
coreLibraryDesugaringEnabled true
@ -38,14 +38,14 @@ android {
}
kotlin {
jvmToolchain(17)
jvmToolchain(21)
}
kotlinOptions {
freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
}
defaultConfig {
minSdkVersion 23
targetSdkVersion 34
targetSdkVersion 35
versionCode 38
versionName "1.0.beta" + versionCode
@ -182,40 +182,40 @@ dependencies {
implementation 'androidx.hilt:hilt-common:1.2.0'
implementation 'androidx.hilt:hilt-work:1.2.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
/**
* AndroidX dependencies:
*/
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.core:core-splashscreen:1.0.1'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.3'
implementation 'androidx.navigation:navigation-ui-ktx:2.8.3'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.4'
implementation 'androidx.navigation:navigation-ui-ktx:2.8.4'
implementation "androidx.browser:browser:1.8.0"
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.3'
implementation 'androidx.navigation:navigation-ui-ktx:2.8.3'
implementation 'androidx.paging:paging-runtime-ktx:3.3.2'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.6'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
implementation "androidx.lifecycle:lifecycle-common-java8:2.8.6"
implementation "androidx.annotation:annotation:1.9.0"
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.4'
implementation 'androidx.navigation:navigation-ui-ktx:2.8.4'
implementation 'androidx.paging:paging-runtime-ktx:3.3.4'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
implementation "androidx.lifecycle:lifecycle-common-java8:2.8.7"
implementation "androidx.annotation:annotation:1.9.1"
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation "androidx.activity:activity-ktx:1.9.3"
implementation 'androidx.fragment:fragment-ktx:1.8.4'
implementation 'androidx.work:work-runtime-ktx:2.9.1'
implementation 'androidx.fragment:fragment-ktx:1.8.5'
implementation 'androidx.work:work-runtime-ktx:2.10.0'
implementation 'androidx.media2:media2-widget:1.3.0'
implementation 'androidx.media2:media2-player:1.3.0'
// Use the most recent version of CameraX
def cameraX_version = '1.3.4'
def cameraX_version = '1.4.0'
implementation "androidx.camera:camera-core:$cameraX_version"
implementation "androidx.camera:camera-camera2:$cameraX_version"
// CameraX Lifecycle library
@ -257,7 +257,7 @@ dependencies {
implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
implementation 'com.github.connyduck:sparkbutton:4.1.0'
implementation 'org.pixeldroid.pixeldroid:android-media-editor:4.2'
implementation 'org.pixeldroid.pixeldroid:android-media-editor:4.3'
implementation project(path: ':scrambler')
implementation project(path: ':pixel_common')
@ -294,7 +294,7 @@ dependencies {
androidTestImplementation 'com.linkedin.testbutler:test-butler-library:2.2.1'
androidTestUtil 'com.linkedin.testbutler:test-butler-app:2.2.1'
androidTestImplementation 'androidx.work:work-testing:2.9.1'
androidTestImplementation 'androidx.work:work-testing:2.10.0'
testImplementation 'org.wiremock:wiremock:3.9.1'
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
testImplementation 'junit:junit:4.13.2'
@ -322,7 +322,8 @@ tasks.withType(Test).configureEach {
}
task jacocoTestReport(type: JacocoReport, dependsOn: ['connectedStagingAndroidTest', 'testStagingUnitTest', 'createStagingCoverageReport']) {
tasks.register('jacocoTestReport', JacocoReport) {
dependsOn['connectedStagingAndroidTest', 'testStagingUnitTest', 'createStagingCoverageReport']
reports {
xml.required = true

4
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.2'
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
@ -15,7 +15,7 @@ buildscript {
}
plugins {
id 'com.google.devtools.ksp' version '2.0.20-1.0.24' apply false
id 'com.google.devtools.ksp' version '2.0.21-1.0.26' apply false
id("com.google.dagger.hilt.android") version "2.52" apply false
}

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,7 +1,7 @@
#Fri Oct 14 13:37:44 GMT 2022
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
pixel_common

@ -1 +1 @@
Subproject commit fadb08a370787bc74a602e585f82f95e04832ebb
Subproject commit 9c48ff7757f776a1cec19dd0a23f125096647616

2
scrambler

@ -1 +1 @@
Subproject commit 1584ad2ac65e75a3fa53d71280d04d4ac015d39f
Subproject commit 74de1b38adae923b615183d4ee53f55a7fc687f6