Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1786164 - Update gradle and plugin to the latest versions. r=geckoview-reviewers,jonalmeida

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D155151
This commit is contained in:
Ryan VanderMeulen 2022-08-31 22:10:38 +00:00
parent 3d5d730c15
commit 893cf3efd4
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -114,7 +114,7 @@ buildscript {
dependencies {
classpath 'org.mozilla.apilint:apilint:0.5.2'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'org.apache.commons:commons-exec:1.3'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.10.0'
classpath 'org.tomlj:tomlj:1.0.0'

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,8 +1,7 @@
#Fri Sep 16 15:41:50 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
# Bug 1596208, Android Studio has a bug that prevents us from using this
# distributionSha256Sum=53b71812f18cdb2777e9f1b2a0f2038683907c90bdc406bc64d8b400e1fb2c3b

6
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
View File

@ -1049,9 +1049,10 @@ public class GeckoAppShell {
return lp.getDomains();
}
@SuppressLint("ResourceType")
@WrapForJNI(calledFrom = "gecko")
private static int[] getSystemColors() {
// attrsAppearance[] must correspond to AndroidSystemColors structure in android/AndroidBridge.h
// attrsAppearance[] must correspond to AndroidSystemColors structure in android/nsLookAndFeel.h
final int[] attrsAppearance = {
android.R.attr.textColorPrimary,
android.R.attr.textColorPrimaryInverse,
@ -1072,8 +1073,7 @@ public class GeckoAppShell {
final ContextThemeWrapper contextThemeWrapper =
new ContextThemeWrapper(getApplicationContext(), android.R.style.TextAppearance);
final TypedArray appearance =
contextThemeWrapper.getTheme().obtainStyledAttributes(attrsAppearance);
final TypedArray appearance = contextThemeWrapper.obtainStyledAttributes(attrsAppearance);
if (appearance != null) {
for (int i = 0; i < appearance.getIndexCount(); i++) {