Skip to content

Commit b03938e

Browse files
Merge remote-tracking branch 'origin/main' into renovate/androidx.fragment-fragment-1.x
# Conflicts: # lib/build.gradle Co-authored-by: tobiasKaminsky <5836855+tobiasKaminsky@users.noreply.github.com>
2 parents cb1540b + 5ccf336 commit b03938e

13 files changed

Lines changed: 81 additions & 22 deletions

File tree

‎.github/workflows/analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
repository: ${{ steps.get-vars.outputs.repo }}
5858
ref: ${{ steps.get-vars.outputs.branch }}
5959
- name: Set up JDK 21
60-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
60+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
6161
with:
6262
distribution: "temurin"
6363
java-version: 25

‎.github/workflows/assemble-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2121
- name: Set up JDK 17
22-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
22+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
2323
with:
2424
distribution: "temurin"
2525
java-version: 25.0.4+101.0.LTS

‎.github/workflows/check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2424
- name: Set up JDK 17
25-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
25+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
2626
with:
2727
distribution: "temurin"
2828
java-version: 25.0.4+101.0.LTS
@@ -34,7 +34,7 @@ jobs:
3434
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
3535
with:
3636
arguments: ${{ matrix.task }}
37-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
37+
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
3838
if: ${{ always() }}
3939
with:
4040
name: ${{ matrix.task }}-report

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
with:
4444
swap-size-gb: 10
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
46+
uses: github/codeql-action/init@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
4747
with:
4848
languages: ${{ matrix.language }}
4949
- name: Set up JDK 21
50-
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
50+
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
5151
with:
5252
distribution: "temurin"
5353
java-version: 25
@@ -57,4 +57,4 @@ jobs:
5757
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
5858
./gradlew --no-daemon assembleDebug
5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
60+
uses: github/codeql-action/analyze@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
29-
- uses: gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
29+
- uses: gradle/actions/wrapper-validation@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0

‎.github/workflows/scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: "Run analysis"
37-
uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc # v2.4.4
37+
uses: ossf/scorecard-action@fa7117db83c52d787ae5a89f350999701505d78e # v2.5.0
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
4141
publish_results: false
4242

4343
# Upload the results to GitHub's code scanning dashboard.
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
45+
uses: github/codeql-action/upload-sarif@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
4646
with:
4747
sarif_file: results.sarif

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
buildscript {
99
ext {
10-
kotlin_version = '2.4.20'
10+
kotlin_version = '2.4.21'
1111
}
1212
repositories {
1313
google()
@@ -16,7 +16,7 @@ buildscript {
1616
maven { url = 'https://plugins.gradle.org/m2/' }
1717
}
1818
dependencies {
19-
classpath 'com.android.tools.build:gradle:9.4.0'
19+
classpath 'com.android.tools.build:gradle:9.4.1'
2020
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2121
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
2222
}

‎gradle/verification-metadata.xml‎

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<trusted-key id="1D85469D8559C2E1DF5F925131D2D79DF7E85DD3" group="org.jcommander" name="jcommander" version="1.85"/>
7575
<trusted-key id="1D9AA7F9E1E2824728B8CD1794B291AEF984A085" group="io.reactivex.rxjava2" name="rxjava" version="2.2.21"/>
7676
<trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
77+
<trusted-key id="2820DE9F95EC4043E616B735FA5C18CFB74EC7C6" group="com.diffplug.spotless"/>
7778
<trusted-key id="2B34821418CF19CF1F2A8352953E02E4F573B46F" group="jakarta.platform"/>
7879
<trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
7980
<trusting group="commons-codec"/>
@@ -105,7 +106,10 @@
105106
<trusting group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.7.3"/>
106107
<trusting group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.7.4"/>
107108
</trusted-key>
108-
<trusted-key id="41CD49B4EF5876F9E9F691DABAC30622339994C4" group="org.jspecify" name="jspecify" version="1.0.0"/>
109+
<trusted-key id="41CD49B4EF5876F9E9F691DABAC30622339994C4">
110+
<trusting group="org.jspecify" name="jspecify" version="1.0.0"/>
111+
<trusting group="org.jspecify" name="jspecify" version="1.0.1"/>
112+
</trusted-key>
109113
<trusted-key id="44FBDBBC1A00FE414F1C1873586654072EAD6677" group="org.sonatype.oss" name="oss-parent" version="9"/>
110114
<trusted-key id="47504B76CF89C15C0512D9AFE16AB52D79FD224F">
111115
<trusting group="com.google.api.grpc" name="proto-google-common-protos" version="2.0.1"/>
@@ -231,6 +235,7 @@
231235
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0"/>
232236
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.100"/>
233237
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.200"/>
238+
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.300"/>
234239
</trusted-key>
235240
<trusted-key id="A31DDE881C3E3C4C985BD0D02C7F998F4272C851" group="com.diffplug.spotless"/>
236241
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA">
@@ -337,6 +342,7 @@
337342
<trusting group="commons-codec"/>
338343
<trusting group="commons-io"/>
339344
<trusting group="org.apache.bcel" name="bcel" version="6.12.0"/>
345+
<trusting group="org.apache.bcel" name="bcel" version="6.13.0"/>
340346
<trusting group="org.apache.commons"/>
341347
</trusted-key>
342348
<trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A" group="org.apache" name="apache"/>
@@ -701,6 +707,11 @@
701707
<sha256 value="55445ad0ff025963929892569a0bfc6b4c68e60d8b7c965dcffba09048c36c8e" origin="Generated by Gradle"/>
702708
</artifact>
703709
</component>
710+
<component group="androidx.core" name="core" version="1.19.1">
711+
<artifact name="core-1.19.1.aar">
712+
<sha256 value="08108ea780205bd54603088a62a6dd5378f63bd25542674be24cd4cdb8191a09" origin="Generated by Gradle"/>
713+
</artifact>
714+
</component>
704715
<component group="androidx.core" name="core" version="1.9.0">
705716
<artifact name="core-1.9.0.aar">
706717
<sha256 value="8bda3ee3a88887d54f6679fb6b6cd788629f73234ac91c8bbed924e721ec85b8" origin="Generated by Gradle"/>
@@ -7650,6 +7661,11 @@
76507661
<sha256 value="15918edd6403157bd994209b3ecd2a118fee9519332844ce8a8924882ebd601d" origin="Generated by Gradle" reason="Artifact is not signed"/>
76517662
</artifact>
76527663
</component>
7664+
<component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="8.10.4">
7665+
<artifact name="com.diffplug.spotless.gradle.plugin-8.10.4.pom">
7666+
<sha256 value="02a1ee341852ed8d8c77378c0052fc32652234682e41db2536a45eaa786cb509" origin="Generated by Gradle" reason="Artifact is not signed"/>
7667+
</artifact>
7668+
</component>
76537669
<component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="8.2.1">
76547670
<artifact name="com.diffplug.spotless.gradle.plugin-8.2.1.pom">
76557671
<sha256 value="306b777dc39f44fec62b50bdefe41b716beb0fd7cd3f81572273a134c2e155b9" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -8422,6 +8438,11 @@
84228438
<sha256 value="080e2984173238b50e064c226afffbb1b0233520295c790a7fd3d6ae4593f063" origin="Generated by Gradle"/>
84238439
</artifact>
84248440
</component>
8441+
<component group="com.google.protobuf" name="protobuf-bom" version="4.28.3">
8442+
<artifact name="protobuf-bom-4.28.3.pom">
8443+
<sha256 value="be3baa9b418864b5ed7d39c3beb3141d83fa78d124554eaa92083243dcbfb27a" origin="Generated by Gradle"/>
8444+
</artifact>
8445+
</component>
84258446
<component group="com.google.protobuf" name="protobuf-java" version="3.22.3">
84268447
<artifact name="protobuf-java-3.22.3.jar">
84278448
<sha256 value="59d388ea6a2d2d76ae8efff7fd4d0c60c6f0f464c3d3ab9be8e5add092975708" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -8493,6 +8514,11 @@
84938514
<sha256 value="64cc0e3ad6e85f5aec8f9dcf9341d1379e9525364ff53e23e16d8d5824673ef7" origin="Generated by Gradle"/>
84948515
</artifact>
84958516
</component>
8517+
<component group="com.google.protobuf" name="protobuf-parent" version="4.28.3">
8518+
<artifact name="protobuf-parent-4.28.3.pom">
8519+
<sha256 value="5364cdc058b2e5a212af6dfc1894299070dd434026a15827bbe313774489f403" origin="Generated by Gradle"/>
8520+
</artifact>
8521+
</component>
84968522
<component group="com.google.testing.platform" name="android-device-provider-local" version="0.0.9-alpha02">
84978523
<artifact name="android-device-provider-local-0.0.9-alpha02.jar">
84988524
<sha256 value="446d0fca4e3711e3e37219cf888ec12b4dec3f14999ee439735385fb787e914b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -11566,6 +11592,11 @@
1156611592
<sha256 value="1e1f6b4222ae7bfd6332003edf70201835990dbd46106b16cddba8a53e3cdf65" origin="Generated by Gradle"/>
1156711593
</artifact>
1156811594
</component>
11595+
<component group="org.apache.groovy" name="groovy-bom" version="4.0.27">
11596+
<artifact name="groovy-bom-4.0.27.pom">
11597+
<sha256 value="aa44eb52bfdfe61d27b3e450d2b348d88deaa3437ab4d9d49a84095348f9f6fb" origin="Generated by Gradle"/>
11598+
</artifact>
11599+
</component>
1156911600
<component group="org.apache.httpcomponents" name="httpclient" version="4.5.14">
1157011601
<artifact name="httpclient-4.5.14.jar">
1157111602
<sha256 value="c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6" origin="Generated by Gradle"/>
@@ -12722,6 +12753,11 @@
1272212753
<sha256 value="d9c45a2f5730e84e9b84fa42c64a1874dcba6668f212c4fe297bea25dc007878" origin="Generated by Gradle"/>
1272312754
</artifact>
1272412755
</component>
12756+
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.4.20">
12757+
<artifact name="kotlin-gradle-plugins-bom-2.4.20.pom">
12758+
<sha256 value="70b071dc4074995076c97c749792ebcff69f10e636d1e2f2c68de0de023e0239" origin="Generated by Gradle"/>
12759+
</artifact>
12760+
</component>
1272512761
<component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="2.1.10">
1272612762
<artifact name="kotlin-klib-commonizer-api-2.1.10.jar">
1272712763
<sha256 value="1bec2ac95262034be8168793a05414ee5628cc1e28c487b25d5f9749ce72da5b" origin="Generated by Gradle"/>
@@ -13557,7 +13593,15 @@
1355713593
<sha256 value="d7a08a99b2502f0bb68cd4e1f984f0bf69324aaa208bd0f73366c03fc3548a42" origin="Generated by Gradle"/>
1355813594
</artifact>
1355913595
</component>
13596+
<component group="org.junit" name="junit-bom" version="5.14.1">
13597+
<artifact name="junit-bom-5.14.1.pom">
13598+
<sha256 value="01b01dfa366550b40ac5760548a7d728b6109d17c451e83864d1e5e0ce862c94" origin="Generated by Gradle"/>
13599+
</artifact>
13600+
</component>
1356013601
<component group="org.junit" name="junit-bom" version="5.14.2">
13602+
<artifact name="junit-bom-5.14.2.module">
13603+
<sha256 value="5d26f4440392326dd2483cf490143eea1495d5095459a0b9651a7b1b38e24ebf" origin="Generated by Gradle"/>
13604+
</artifact>
1356113605
<artifact name="junit-bom-5.14.2.pom">
1356213606
<sha256 value="ed2dcc7855bd460bccc93a1bf0c962e63b566ff7d8f1ded0f1f2593ba8183aaf" origin="Generated by Gradle"/>
1356313607
</artifact>
@@ -13843,6 +13887,11 @@
1384313887
<sha256 value="150c40287f7cecdc21b9380caac98e928c4f33c023db6b348df1c5ac977026bf" origin="Generated by Gradle"/>
1384413888
</artifact>
1384513889
</component>
13890+
<component group="org.slf4j" name="slf4j-api" version="2.0.18">
13891+
<artifact name="slf4j-api-2.0.18.pom">
13892+
<sha256 value="6c2c7f2c02774cc2b7b619fbd2df7873cdad29718926e44754b87f70d1eb43cb" origin="Generated by Gradle"/>
13893+
</artifact>
13894+
</component>
1384613895
<component group="org.slf4j" name="slf4j-api" version="2.0.4">
1384713896
<artifact name="slf4j-api-2.0.4.jar">
1384813897
<sha256 value="57fa874599ace9259286b99253d7a877afdd2db4b07a6827ac6c847ca5d601a2" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -13877,6 +13926,11 @@
1387713926
<sha256 value="f78d27b642b4b886eb839fc102b5cd9fe7f30f37599ffe68185be4e1609031e9" origin="Generated by Gradle"/>
1387813927
</artifact>
1387913928
</component>
13929+
<component group="org.slf4j" name="slf4j-bom" version="2.0.18">
13930+
<artifact name="slf4j-bom-2.0.18.pom">
13931+
<sha256 value="9219aab601575126c4e66e1331eb2b0c6c17a330ac4d5a07e3cd11d580a0c12d" origin="Generated by Gradle"/>
13932+
</artifact>
13933+
</component>
1388013934
<component group="org.slf4j" name="slf4j-bom" version="2.0.9">
1388113935
<artifact name="slf4j-bom-2.0.9.pom">
1388213936
<sha256 value="eaef4584807d812c6a0b6cf839d5e47f50c754327719b9ce081e271d15da6243" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -13902,6 +13956,11 @@
1390213956
<sha256 value="95cd71e852dfdb29126e58b7b939d57ec2b2e6024391852e0b545dee082bbf3b" origin="Generated by Gradle"/>
1390313957
</artifact>
1390413958
</component>
13959+
<component group="org.slf4j" name="slf4j-parent" version="2.0.18">
13960+
<artifact name="slf4j-parent-2.0.18.pom">
13961+
<sha256 value="0b3896bedad2c9ed9697edcbea1da0c54cd238a723583a81358a83bfb782e9fa" origin="Generated by Gradle"/>
13962+
</artifact>
13963+
</component>
1390513964
<component group="org.slf4j" name="slf4j-parent" version="2.0.4">
1390613965
<artifact name="slf4j-parent-2.0.4.pom">
1390713966
<sha256 value="dc9dc87f53a8af721ee49dbb521bd06cda06134214fdad9400d872a75426cffd" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip
44
networkTimeout=10000
55
retries=0
66
retryBackOffMs=500

‎lib/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ buildscript {
1616
junit_version = '4.13.2'
1717
}
1818
dependencies {
19-
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.11'
19+
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.13'
2020
}
2121
}
2222

2323
plugins {
24-
id "com.diffplug.spotless" version "8.10.2"
24+
id "com.diffplug.spotless" version "8.10.4"
2525
}
2626

2727
apply plugin: "kotlin-android"
@@ -137,7 +137,7 @@ dependencies {
137137

138138
implementation "androidx.appcompat:appcompat:1.8.0"
139139
implementation 'androidx.annotation:annotation:1.10.0'
140-
implementation 'androidx.core:core:1.19.0'
140+
implementation 'androidx.core:core:1.19.1'
141141
implementation 'androidx.fragment:fragment:1.9.1'
142142

143143
implementation 'com.google.android.material:material:1.14.0'

0 commit comments

Comments
 (0)