mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 00:34:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Tobias Kaminsky 2024-05-07 02:31:08 +02:00
commit fdcd2b8d87
4 changed files with 20 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:noble@sha256:562456a05a0dbd62a671c1854868862a4687bf979a96d48ae8e766642cd911e8
FROM ubuntu:noble@sha256:3f85b7caad41a95462cf5b787d8a04604c8262cdcdf9a472b8c52ef83375fe15
ARG DEBIAN_FRONTEND=noninteractive
ENV ANDROID_HOME=/usr/lib/android-sdk

2
.github/workflows/unit-tests.yml vendored
View file

@ -42,7 +42,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "test" "Unit" ${{github.event.number}}
- name: Upload coverage to codecov
uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: unit

6
app/build.gradle
View file

@ -16,7 +16,7 @@ import org.gradle.internal.jvm.Jvm
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$androidPluginVersion"
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.13'
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.14'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6"
classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
@ -263,7 +263,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.12"
kotlinCompilerExtensionVersion = "1.5.13"
}
}
@ -275,7 +275,7 @@ dependencies {
}
// Jetpack Compose
implementation(platform("androidx.compose:compose-bom:2024.04.01"))
implementation(platform("androidx.compose:compose-bom:2024.05.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.material3:material3")

47
gradle/verification-metadata.xml
View file

@ -772,6 +772,11 @@
<sha256 value="cf9707c211b4c053ffe971616eb358bd7353f429a457527e52018064636282bc" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.compose" name="compose-bom" version="2024.05.00">
<artifact name="compose-bom-2024.05.00.pom">
<sha256 value="db1492b88e41c6039b0b3f2dcf94ae3fcedf74270eba824598184bad03a122ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.compose.animation" name="animation-core" version="1.0.0-beta03">
<artifact name="animation-core-1.0.0-beta03.aar">
<sha256 value="4626086855eb6582dda9c3050c05bb56632f5a0308a3bb71a0f58def958602ca" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -5813,30 +5818,6 @@
<sha256 value="0e72841878595f83c6d8f93aa51f78a67e821f53446fcb7a5d94cfaad8ebbbac" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="75e3b0af940f6040f19a357993ca22e2660361de">
<artifact name="android-library-75e3b0af940f6040f19a357993ca22e2660361de.aar">
<sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-75e3b0af940f6040f19a357993ca22e2660361de.module">
<sha256 value="9e1d74d937ce3d2a107f6fa21b68957fc5bd2ef0d3aff897420a5a725d17ef04" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="844835b2a23228704688b976829c4ae2b9cf14d9">
<artifact name="android-library-844835b2a23228704688b976829c4ae2b9cf14d9.aar">
<sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-844835b2a23228704688b976829c4ae2b9cf14d9.module">
<sha256 value="c92068d349fa6836d767b33153cd67ffec9a58cce51af1c373c965946efc261b" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="8a00bdb88cf47ba533c417ab0ab449a4dbebc197">
<artifact name="android-library-8a00bdb88cf47ba533c417ab0ab449a4dbebc197.aar">
<sha256 value="4d4dde663ce61bea1d2ef519d2a7b02cfed56c49fe8bddd3a96a61e4ee49de27" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-8a00bdb88cf47ba533c417ab0ab449a4dbebc197.module">
<sha256 value="53b084471985ba5ebb53e3fc7952f6505ff6f9e781654c64402dc83f645b3a01" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="9fdcd0af0ff910086281f32e3b8ef74490671149">
<artifact name="android-library-9fdcd0af0ff910086281f32e3b8ef74490671149.aar">
<sha256 value="57ab4fd7c922875a7e0b5feac20aa27ab5df0fd3b4e042f92ed727c0b6316e81" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -5845,14 +5826,6 @@
<sha256 value="19f801a02d0bffa7c832e382e1918e4d2b392bcf9e611feba2dba24e9fa9e598" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="ac0517ab43c9f2ac30fad092d7c658511e578a61">
<artifact name="android-library-ac0517ab43c9f2ac30fad092d7c658511e578a61.aar">
<sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-ac0517ab43c9f2ac30fad092d7c658511e578a61.module">
<sha256 value="f4edff0d22769a3a078240f17e786a84b57a69c17d07820e9c50a6e673dad3b1" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="acc7df66e4a43ed7f450136c13753f2743fb245e">
<artifact name="android-library-acc7df66e4a43ed7f450136c13753f2743fb245e.aar">
<sha256 value="f30c2d22c923c6ff8c605eb4cf713cfaf49eb967611f70dc3d139725b0891483" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -8764,6 +8737,11 @@
<sha256 value="6cf3495fc2e6ac913a2b7f2e03fb5908fb3f229fb06d3358dc45678d5af3e36e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="69">
<artifact name="commons-parent-69.pom">
<sha256 value="d50da9c39bdca823d618d1b4a03b73f196497fcb8616fd0da727c8623592a9bb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-text" version="1.10.0">
<artifact name="commons-text-1.10.0.jar">
<sha256 value="770cd903fa7b604d1f7ef7ba17f84108667294b2b478be8ed1af3bffb4ae0018" origin="Generated by Gradle"/>
@ -10313,6 +10291,11 @@
<sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.junit" name="junit-bom" version="5.10.2">
<artifact name="junit-bom-5.10.2.pom">
<sha256 value="169dd904a4b0f6520cffe658cc62292bfe9f3c14a989fa92120724cde43a9968" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.junit" name="junit-bom" version="5.7.1">
<artifact name="junit-bom-5.7.1.pom">
<sha256 value="0b9b14a3d62106fafe8c68a717b87b87ad18685899451b753c04fa41b6857784" origin="Generated by Gradle"/>