Skip to content

Commit 0113ac7

Browse files
committed
Merge branch 'master' into androidx
2 parents 3fd7a91 + 35de0c4 commit 0113ac7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
with:
1515
java-version: 1.8
1616
- name: Build with Gradle
17-
run: ./gradlew aR
17+
run: ./gradlew build aR

lib/utilcode/src/main/java/com/blankj/utilcode/util/GsonUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static Gson getGson(final String key) {
6767
return GSONS.get(key);
6868
}
6969

70-
private static Gson getGson() {
70+
public static Gson getGson() {
7171
Gson gsonDelegate = GSONS.get(KEY_DELEGATE);
7272
if (gsonDelegate != null) {
7373
return gsonDelegate;

lib/utilcode/src/test/java/com/blankj/utilcode/util/ApiUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class ApiUtilsTest extends BaseTest {
1515

1616
@Before
1717
public void setUp() throws Exception {
18-
ApiUtils.register(ApiUtils.BaseApi.class);
18+
ApiUtils.register(TestApiImpl.class);
1919
}
2020

2121
@Test

0 commit comments

Comments
 (0)