Skip to content

Commit e1ab50d

Browse files
authoredNov 12, 2020
Merge pull request android#283 from android/dev_alpha07
[All] Update to Compose 1.0.0-alpha07
2 parents 4d21fa4 + 7701008 commit e1ab50d

File tree

123 files changed

+1456
-2021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+1456
-2021
lines changed
 

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Contributor License Agreements
44

5-
We'd love to accept your sample apps and patches! Before we can take them, we
5+
We'd love to accept your patches! Before we can take them, we
66
have to jump a couple of legal hurdles.
77

88
Please fill out either the individual or corporate Contributor License Agreement (CLA).

‎Crane/app/build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,10 @@ android {
9696
}
9797

9898
packagingOptions {
99-
exclude "META-INF/licenses/**"
100-
exclude "META-INF/AL2.0"
101-
exclude "META-INF/LGPL2.1"
99+
// Multiple dependency bring these files in. Exclude them to enable
100+
// our test APK to build (has no effect on our AARs)
101+
excludes += "/META-INF/AL2.0"
102+
excludes += "/META-INF/LGPL2.1"
102103
}
103104
}
104105

0 commit comments

Comments
 (0)
Please sign in to comment.