Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Android SDK 32, 33, 34 #983

Merged
merged 17 commits into from
Dec 18, 2023
Merged

Add support for Android SDK 32, 33, 34 #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fdc3bfb
add sdks
gpolak Dec 15, 2023
8b6c32f
readmes
gpolak Dec 15, 2023
161ce8f
test extension
gpolak Dec 15, 2023
9a361b3
bumping version
gpolak Dec 15, 2023
63c1a2d
Update signing certificate for Sonatype (#982)
jonathanbaker7 Dec 15, 2023
6943ddc
add sdks
gpolak Dec 15, 2023
d1ff3ec
readmes
gpolak Dec 15, 2023
9bede58
test extension
gpolak Dec 15, 2023
3c1f882
bumping version
gpolak Dec 15, 2023
c53e71a
readme
gpolak Dec 16, 2023
9ecd9a8
back to i3 for tests
gpolak Dec 16, 2023
3d846ee
Merge branch 'georgep_add_sdk_support' of github.com:uber/okbuck into…
gpolak Dec 16, 2023
54bf020
Create secring.gpg
gpolak Dec 16, 2023
689491e
readme
gpolak Dec 16, 2023
2a5ddbc
test extension back to i3
gpolak Dec 16, 2023
3f6bdfe
cleanup gitignore
gpolak Dec 16, 2023
3eceabc
too early to bump
gpolak Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.gradle
local.properties
.DS_Store

**build
captures

Expand All @@ -16,6 +17,7 @@ buck-out
**/BUCK

buildSrc/bintray.properties
buildSrc/secring.gpg
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Helps with local testing

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I don't think there should be a dev flow where there's a local secring. The signings creds should live in $HOME/.gradle which is outside the repo, and the secreing typically sits in a separate user path.

This is fine overall, as it's mostly a no-op. Just more curious on the flow that made this needed.


# Bazel
bazel-*
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@
* Add configuration cleanCacheDir to conditionally delete the cache directory or
just the existing dependency rules files

### Version 0.54.0
### Version 0.54.0
* Stop using /tmp for Android Lint gen-rule and use buck-out tmp instead

### Version 0.54.1
### Version 0.54.1
* Clean up leftover tmp file for Android Lint genrule

### Version 0.54.2
* Signing certificate is invalid, replacement release with new signature.
* No other code changes

### Version 0.54.3
* Added support for Android API 32, 33, and 34
11 changes: 10 additions & 1 deletion buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ enum API {
API_28("9", "4913185-2"),
API_29("10", "5803371"),
API_30("11", "6757853"),
API_31("12", "7732740");
API_31("12", "7732740"),
API_32("12.1", "8229987"),
API_33("13", "9030017"),
API_34("14", "10818077");

private final String androidVersion;
private final String frameworkSdkBuildVersion;
Expand Down Expand Up @@ -173,6 +176,12 @@ static API from(String apiLevel) {
return API_30;
case "31":
return API_31;
case "32":
return API_32;
case "33":
return API_33;
case "34":
return API_34;
default:
throw new IllegalStateException("Unknown Robolectric API Level: " + apiLevel);
}
Expand Down
Loading