Skip to content

Commit 6522c2e

Browse files
falhassenglide-copybara-robot
authored andcommitted
No public description
PiperOrigin-RevId: 741382558
1 parent 8098c4d commit 6522c2e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

renovate.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
"config:base"
55
],
66
"packageRules": [
7-
{
8-
"matchPackageNames": ["androidx-fragment"],
9-
"allowedVersions": "<1.4"
10-
},
117
{
128
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
139
"automerge": true,
1410
"automergeType": "branch",
15-
},
11+
"ignoreDeps": ["androidx.fragment:fragment", "androidx.annotation:annotation"]
12+
}
1613
]
1714
}

settings.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ dependencyResolutionManagement {
7272
library('android-gradle', 'com.android.tools.build:gradle:7.3.0')
7373
library('androidx-cardview', 'androidx.cardview:cardview:1.0.0')
7474
library('androidx-core', 'androidx.core:core:1.6.0')
75-
library('androidx-annotation', 'androidx.annotation:annotation:1.3.0')
75+
// 1.6.0 seems to introduce:
76+
// The dependency contains Java 8 bytecode. Please enable desugaring by adding the following to build.gradle
77+
// in the samples.
78+
library('androidx-annotation', 'androidx.annotation:annotation:1.5.0')
7679
library('androidx-appcompat', 'androidx.appcompat:appcompat:1.3.1')
7780
library('androidx-benchmark.gradle', 'androidx.benchmark', 'benchmark-gradle-plugin').versionRef('androidx-benchmark')
7881
library('androidx-benchmark.junit', 'androidx.benchmark', 'benchmark-junit4').versionRef('androidx-benchmark')

0 commit comments

Comments
 (0)