From 5f86cbfcbae2ce2f60b826b521abe09f4fd3804d Mon Sep 17 00:00:00 2001 From: Jonathan Almeida Date: Wed, 28 Apr 2021 13:53:38 -0400 Subject: [PATCH] Update to Gradle 6.5.1 and AGP 4.0.1 --- app/build.gradle | 1 - app/src/main/AndroidManifest.xml | 10 ---------- .../org/mozilla/focus/fragment/UrlInputFragment.kt | 4 ++-- .../searchsuggestions/ui/SearchSuggestionsFragment.kt | 5 ++--- app/src/main/res/layout-sw600dp/toolbar.xml | 3 ++- app/src/main/res/layout/focus_preference.xml | 5 +++-- app/src/main/res/layout/fragment_browser.xml | 4 +++- app/src/main/res/layout/toolbar.xml | 3 ++- build.gradle | 2 +- gradle.properties | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- 11 files changed, 16 insertions(+), 24 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5a8247f82c0..f686f723143 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,6 @@ import com.android.build.OutputFile android { compileSdkVersion 29 - buildToolsVersion '28.0.3' defaultConfig { applicationId "org.mozilla" minSdkVersion 21 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ad54c5d2ced..7bd9f66f35e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,9 +86,6 @@ android:autoRemoveFromRecents="false" android:label="@string/app_name" /> - - @@ -99,13 +96,6 @@ - - - diff --git a/app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.kt b/app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.kt index ffe9f313bfc..898dfebdc39 100644 --- a/app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.kt +++ b/app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.kt @@ -22,7 +22,7 @@ import android.webkit.URLUtil import android.widget.FrameLayout import android.widget.TextView import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.preference.PreferenceManager import kotlinx.android.synthetic.main.fragment_urlinput.* import kotlinx.android.synthetic.main.fragment_urlinput.view.* @@ -170,7 +170,7 @@ class UrlInputFragment : override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - searchSuggestionsViewModel = ViewModelProviders.of(this).get(SearchSuggestionsViewModel::class.java) + searchSuggestionsViewModel = ViewModelProvider(this).get(SearchSuggestionsViewModel::class.java) PreferenceManager.getDefaultSharedPreferences(context) .registerOnSharedPreferenceChangeListener(this) diff --git a/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchSuggestionsFragment.kt b/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchSuggestionsFragment.kt index ffc1e477032..0b560baca57 100644 --- a/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchSuggestionsFragment.kt +++ b/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchSuggestionsFragment.kt @@ -5,7 +5,6 @@ package org.mozilla.focus.searchsuggestions.ui import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders import android.graphics.Color import android.os.Bundle import androidx.fragment.app.Fragment @@ -24,6 +23,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView +import androidx.lifecycle.ViewModelProvider import kotlinx.android.synthetic.main.fragment_search_suggestions.* import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -51,8 +51,7 @@ class SearchSuggestionsFragment : Fragment(), CoroutineScope { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - searchSuggestionsViewModel = ViewModelProviders - .of(requireParentFragment()) + searchSuggestionsViewModel = ViewModelProvider(this) .get(SearchSuggestionsViewModel::class.java) } diff --git a/app/src/main/res/layout-sw600dp/toolbar.xml b/app/src/main/res/layout-sw600dp/toolbar.xml index 599e355b21c..0ee4116462f 100644 --- a/app/src/main/res/layout-sw600dp/toolbar.xml +++ b/app/src/main/res/layout-sw600dp/toolbar.xml @@ -3,6 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + app:tint="#FFFFFF" /> diff --git a/app/src/main/res/layout/focus_preference.xml b/app/src/main/res/layout/focus_preference.xml index 1e515928362..134b2ed1e6a 100644 --- a/app/src/main/res/layout/focus_preference.xml +++ b/app/src/main/res/layout/focus_preference.xml @@ -18,6 +18,7 @@ ~ limitations under the License --> + android:importantForAccessibility="no" + app:tint="@color/colorSettingsTint" /> + xmlns:mozac="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + app:tint="#FFFFFF" /> diff --git a/build.gradle b/build.gradle index d05bd7bcc9f..fb2cae1eaad 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 59e0c542f92..b02e7cbd89f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,6 @@ # The setting is particularly useful for tweaking memory settings. android.useAndroidX=true org.gradle.jvmargs=-Xms1g -Xmx4g -android.enableR8=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 70f684a9778..2ef9ac8a461 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip