Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Update grade & build tools #2930

Merged
merged 3 commits into from
Mar 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .taskcluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ tasks:
expires: {$fromNow: 1 year}
payload:
maxRunTime: 14400
image: 'mozillamixedreality/firefoxreality:190312'
image: 'mozillamixedreality/firefoxreality:200316-SDK29'
command:
- /bin/bash
- '--login'
Expand Down Expand Up @@ -77,7 +77,7 @@ tasks:
- [email protected]
payload:
maxRunTime: 14400
image: 'mozillamixedreality/firefoxreality:190312'
image: 'mozillamixedreality/firefoxreality:200316-SDK29'
features:
taskclusterProxy: true
command:
Expand Down Expand Up @@ -127,7 +127,7 @@ tasks:
- [email protected]
payload:
maxRunTime: 14400
image: 'mozillamixedreality/firefoxreality:190312'
image: 'mozillamixedreality/firefoxreality:200316-SDK29'
features:
taskclusterProxy: true
command:
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:extractNativeLibs="true"
android:theme="@style/FxR.Dark">
<activity
android:name=".VRBrowserActivity"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/attrs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<attr name="buttonText" format="string" />
<attr name="title" format="string" />
<attr name="description" format="string" />
<attr name="itemMargin" format="dimension" />
<attr name="by" format="string" />
<attr name="highlightedTextColor" format="reference|color" />
<attr name="tooltipDelay" format="integer" />
<attr name="tooltipPosition" format="enum">
<enum name="top" value="0"/>
Expand Down
1 change: 1 addition & 0 deletions app/src/test/resources/robolectric.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sdk=28
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
apply from: 'versions.gradle'
addRepos(repositories)
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:3.6.1'
classpath "org.mozilla.telemetry:glean-gradle-plugin:$versions.telemetry"
classpath "$deps.kotlin.plugin"

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Apr 23 11:47:41 CEST 2019
#Thu Mar 05 16:03:14 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
4 changes: 2 additions & 2 deletions versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ ext.deps = deps
def build_versions = [:]
build_versions.min_sdk = 24
build_versions.min_sdk_wave = 25
build_versions.target_sdk = 28
build_versions.build_tools = "28.0.3"
build_versions.target_sdk = 29
build_versions.build_tools = "29.0.2"
ext.build_versions = build_versions

ext.deps = deps
Expand Down