From fdc3bfb097eefeb1b7d0518c9bf1c82cb8181944 Mon Sep 17 00:00:00 2001 From: George Polak Date: Fri, 15 Dec 2023 11:00:18 -0500 Subject: [PATCH 01/16] add sdks --- .../uber/okbuck/core/manager/RobolectricManager.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java b/buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java index 630d3971..c5ba02a9 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java +++ b/buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java @@ -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; @@ -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); } From 8b6c32ff801573abbdaea892cfedd1a9be464d20 Mon Sep 17 00:00:00 2001 From: George Polak Date: Fri, 15 Dec 2023 11:00:25 -0500 Subject: [PATCH 02/16] readmes --- CHANGELOG.md | 3 +++ README-zh.md | 2 +- README.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c46b3956..301d0b8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,3 +15,6 @@ ### Version 0.54.1 * Clean up leftover tmp file for Android Lint genrule + + ### Version 0.54.2 +* Added support for Android API 32, 33, and 34 diff --git a/README-zh.md b/README-zh.md index 895cf214..443137f5 100644 --- a/README-zh.md +++ b/README-zh.md @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.1' + classpath 'com.uber:okbuck:0.54.2' } } diff --git a/README.md b/README.md index cfefbf25..85f1f6cc 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.1' + classpath 'com.uber:okbuck:0.54.2' } } From 161ce8f0b6438ec0a5836566a773965ac6bc22dd Mon Sep 17 00:00:00 2001 From: George Polak Date: Fri, 15 Dec 2023 14:42:59 -0500 Subject: [PATCH 03/16] test extension --- .../src/main/java/com/uber/okbuck/extension/TestExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java index 43df9b7d..4d111351 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java +++ b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java @@ -18,7 +18,7 @@ public class TestExtension { * Hardcoded in Robolectric * https://github.com/robolectric/robolectric/blob/master/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java#L50 */ - public String robolectricPreinstrumentedVersion = "i3"; + public String robolectricPreinstrumentedVersion = "i4"; /** Enable generation of espresso test rules. */ public boolean espresso = false; From 9a361b313ac725ae8760734677689c6c7f630604 Mon Sep 17 00:00:00 2001 From: George Polak Date: Fri, 15 Dec 2023 15:48:30 -0500 Subject: [PATCH 04/16] bumping version --- CHANGELOG.md | 2 +- README-zh.md | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 301d0b8f..40a7c09f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,5 +16,5 @@ ### Version 0.54.1 * Clean up leftover tmp file for Android Lint genrule - ### Version 0.54.2 + ### Version 0.54.3 * Added support for Android API 32, 33, and 34 diff --git a/README-zh.md b/README-zh.md index 443137f5..4411c4c6 100644 --- a/README-zh.md +++ b/README-zh.md @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.2' + classpath 'com.uber:okbuck:0.54.3' } } diff --git a/README.md b/README.md index 85f1f6cc..ce4f12b6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.2' + classpath 'com.uber:okbuck:0.54.3' } } From 63c1a2d50e4b1df812ffe3d827ee6cdcc02609c6 Mon Sep 17 00:00:00 2001 From: Jonathan Baker Date: Fri, 15 Dec 2023 16:05:53 -0500 Subject: [PATCH 05/16] Update signing certificate for Sonatype (#982) * Prepare for release 0.54.2 * Prepare next development version. * Revert gradle.properties --- CHANGELOG.md | 4 ++++ README-zh.md | 2 +- README.md | 2 +- buildSrc/gradle.properties | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c46b3956..0436cdab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,3 +15,7 @@ ### 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 diff --git a/README-zh.md b/README-zh.md index 895cf214..443137f5 100644 --- a/README-zh.md +++ b/README-zh.md @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.1' + classpath 'com.uber:okbuck:0.54.2' } } diff --git a/README.md b/README.md index cfefbf25..85f1f6cc 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.1' + classpath 'com.uber:okbuck:0.54.2' } } diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index 3aec9a9e..d3161bf6 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.uber -VERSION_NAME=0.54.2-SNAPSHOT +VERSION_NAME=0.54.3-SNAPSHOT POM_DESCRIPTION=A Gradle plugin that lets developers utilize the Buck build system on a Gradle project POM_URL=https://github.com/uber/okbuck/ POM_SCM_URL=https://github.com/uber/okbuck/ From 6943ddc960905ce90f52e2ba482554642a6b3c13 Mon Sep 17 00:00:00 2001 From: George Polak Date: Fri, 15 Dec 2023 11:00:18 -0500 Subject: [PATCH 06/16] add sdks --- .../uber/okbuck/core/manager/RobolectricManager.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java b/buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java index 630d3971..c5ba02a9 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java +++ b/buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java @@ -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; @@ -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); } From d1ff3ec13bc2fe8ace1324a1a8dcc9e241f40e9f Mon Sep 17 00:00:00 2001 From: George Polak Date: Fri, 15 Dec 2023 11:00:25 -0500 Subject: [PATCH 07/16] readmes --- CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0436cdab..d440bed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +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 +### 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 From 9bede58ecb63461cfbdf4e70f300de37dd637e80 Mon Sep 17 00:00:00 2001 From: George Polak Date: Fri, 15 Dec 2023 14:42:59 -0500 Subject: [PATCH 08/16] test extension --- .../src/main/java/com/uber/okbuck/extension/TestExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java index 43df9b7d..4d111351 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java +++ b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java @@ -18,7 +18,7 @@ public class TestExtension { * Hardcoded in Robolectric * https://github.com/robolectric/robolectric/blob/master/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java#L50 */ - public String robolectricPreinstrumentedVersion = "i3"; + public String robolectricPreinstrumentedVersion = "i4"; /** Enable generation of espresso test rules. */ public boolean espresso = false; From 3c1f882a372dcb9801a8754791fb9b0ecb8cc100 Mon Sep 17 00:00:00 2001 From: George Polak Date: Fri, 15 Dec 2023 15:48:30 -0500 Subject: [PATCH 09/16] bumping version --- CHANGELOG.md | 1 + README-zh.md | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d440bed3..215e310f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,3 +22,4 @@ ### Version 0.54.3 * Added support for Android API 32, 33, and 34 + diff --git a/README-zh.md b/README-zh.md index 443137f5..4411c4c6 100644 --- a/README-zh.md +++ b/README-zh.md @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.2' + classpath 'com.uber:okbuck:0.54.3' } } diff --git a/README.md b/README.md index 85f1f6cc..ce4f12b6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.2' + classpath 'com.uber:okbuck:0.54.3' } } From c53e71aa540cb0eeddd27ec53d92fdbf857ca732 Mon Sep 17 00:00:00 2001 From: George Polak Date: Sat, 16 Dec 2023 14:36:42 -0500 Subject: [PATCH 10/16] readme --- README-zh.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-zh.md b/README-zh.md index 4411c4c6..895cf214 100644 --- a/README-zh.md +++ b/README-zh.md @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.3' + classpath 'com.uber:okbuck:0.54.1' } } diff --git a/README.md b/README.md index ce4f12b6..cfefbf25 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.3' + classpath 'com.uber:okbuck:0.54.1' } } From 9ecd9a8649ee762540dec52b5390a81dfcda8f8b Mon Sep 17 00:00:00 2001 From: George Polak Date: Sat, 16 Dec 2023 14:37:07 -0500 Subject: [PATCH 11/16] back to i3 for tests --- .../src/main/java/com/uber/okbuck/extension/TestExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java index 4d111351..43df9b7d 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java +++ b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java @@ -18,7 +18,7 @@ public class TestExtension { * Hardcoded in Robolectric * https://github.com/robolectric/robolectric/blob/master/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java#L50 */ - public String robolectricPreinstrumentedVersion = "i4"; + public String robolectricPreinstrumentedVersion = "i3"; /** Enable generation of espresso test rules. */ public boolean espresso = false; From 54bf02076aaadb3cd8f542ab0113cf00305ebab7 Mon Sep 17 00:00:00 2001 From: George Polak Date: Sat, 16 Dec 2023 14:43:21 -0500 Subject: [PATCH 12/16] Create secring.gpg --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d2bcd659..a04d1a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ buildSrc/bintray.properties bazel-* .ijwb BUILD.bazel +buildSrc/secring.gpg From 689491e089d71e28f10e62ea5f6936d8cffacec4 Mon Sep 17 00:00:00 2001 From: George Polak Date: Sat, 16 Dec 2023 14:44:25 -0500 Subject: [PATCH 13/16] readme --- README-zh.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-zh.md b/README-zh.md index 4411c4c6..895cf214 100644 --- a/README-zh.md +++ b/README-zh.md @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.3' + classpath 'com.uber:okbuck:0.54.1' } } diff --git a/README.md b/README.md index ce4f12b6..cfefbf25 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.uber:okbuck:0.54.3' + classpath 'com.uber:okbuck:0.54.1' } } From 2a5ddbcb0aa5eaff13ef888e60b546d040547455 Mon Sep 17 00:00:00 2001 From: George Polak Date: Sat, 16 Dec 2023 14:46:11 -0500 Subject: [PATCH 14/16] test extension back to i3 --- .../src/main/java/com/uber/okbuck/extension/TestExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java index 4d111351..43df9b7d 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java +++ b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java @@ -18,7 +18,7 @@ public class TestExtension { * Hardcoded in Robolectric * https://github.com/robolectric/robolectric/blob/master/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java#L50 */ - public String robolectricPreinstrumentedVersion = "i4"; + public String robolectricPreinstrumentedVersion = "i3"; /** Enable generation of espresso test rules. */ public boolean espresso = false; From 3f6bdfe8774b1d0f9228b1f879c59238a18d04ef Mon Sep 17 00:00:00 2001 From: George Polak Date: Sat, 16 Dec 2023 14:46:19 -0500 Subject: [PATCH 15/16] cleanup gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a04d1a9d..099ef6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .gradle local.properties .DS_Store + **build captures @@ -16,9 +17,9 @@ buck-out **/BUCK buildSrc/bintray.properties +buildSrc/secring.gpg # Bazel bazel-* .ijwb BUILD.bazel -buildSrc/secring.gpg From 3eceabc41993978030b0e07ff1a53ebcd561163b Mon Sep 17 00:00:00 2001 From: George Polak Date: Sat, 16 Dec 2023 16:37:26 -0500 Subject: [PATCH 16/16] too early to bump --- buildSrc/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index d3161bf6..3aec9a9e 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.uber -VERSION_NAME=0.54.3-SNAPSHOT +VERSION_NAME=0.54.2-SNAPSHOT POM_DESCRIPTION=A Gradle plugin that lets developers utilize the Buck build system on a Gradle project POM_URL=https://github.com/uber/okbuck/ POM_SCM_URL=https://github.com/uber/okbuck/