Unverified Commit 79ff8a5c authored by Michael Goderbauer's avatar Michael Goderbauer Committed by GitHub

Revert "Bump to Gradle 7 and use Open JDK 11 (#88133)" (#88189)

This reverts commit 91e0759b.
parent 91e0759b
...@@ -1266,77 +1266,41 @@ targets: ...@@ -1266,77 +1266,41 @@ targets:
- name: Linux_android complex_layout_android__compile - name: Linux_android complex_layout_android__compile
recipe: devicelab/devicelab_drone recipe: devicelab/devicelab_drone
presubmit: false presubmit: false
bringup: true
timeout: 60 timeout: 60
properties: properties:
tags: > tags: >
["devicelab","android","linux"] ["devicelab","android","linux"]
task_name: complex_layout_android__compile task_name: complex_layout_android__compile
dependencies: >-
[
{"dependency": "open_jdk", "version": "11"}
]
caches: >-
[
{"name": "openjdk", "path": "java11"}
]
scheduler: luci scheduler: luci
- name: Linux_android complex_layout_android__scroll_smoothness - name: Linux_android complex_layout_android__scroll_smoothness
recipe: devicelab/devicelab_drone recipe: devicelab/devicelab_drone
presubmit: false presubmit: false
bringup: true
timeout: 60 timeout: 60
properties: properties:
tags: > tags: >
["devicelab","android","linux"] ["devicelab","android","linux"]
task_name: complex_layout_android__scroll_smoothness task_name: complex_layout_android__scroll_smoothness
dependencies: >-
[
{"dependency": "open_jdk", "version": "11"}
]
caches: >-
[
{"name": "openjdk", "path": "java11"}
]
scheduler: luci scheduler: luci
- name: Linux_android complex_layout_scroll_perf__devtools_memory - name: Linux_android complex_layout_scroll_perf__devtools_memory
recipe: devicelab/devicelab_drone recipe: devicelab/devicelab_drone
presubmit: false presubmit: false
bringup: true
timeout: 60 timeout: 60
properties: properties:
tags: > tags: >
["devicelab","android","linux"] ["devicelab","android","linux"]
task_name: complex_layout_scroll_perf__devtools_memory task_name: complex_layout_scroll_perf__devtools_memory
dependencies: >-
[
{"dependency": "open_jdk", "version": "11"}
]
caches: >-
[
{"name": "openjdk", "path": "java11"}
]
scheduler: luci scheduler: luci
- name: Linux_android complex_layout_semantics_perf - name: Linux_android complex_layout_semantics_perf
recipe: devicelab/devicelab_drone recipe: devicelab/devicelab_drone
presubmit: false presubmit: false
bringup: true
timeout: 60 timeout: 60
properties: properties:
tags: > tags: >
["devicelab","android","linux"] ["devicelab","android","linux"]
task_name: complex_layout_semantics_perf task_name: complex_layout_semantics_perf
dependencies: >-
[
{"dependency": "open_jdk", "version": "11"}
]
caches: >-
[
{"name": "openjdk", "path": "java11"}
]
scheduler: luci scheduler: luci
- name: Linux_android cubic_bezier_perf__e2e_summary - name: Linux_android cubic_bezier_perf__e2e_summary
......
...@@ -14,7 +14,7 @@ buildscript { ...@@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.0.0' classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
......
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment