From ae0ed821959cc6b5b255b0774becd34c317e53f8 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Wed, 12 Jun 2024 18:05:25 +0200 Subject: [PATCH] Backed out 2 changesets (bug 1900345) for preventing Fenix builds with Android Studio in the repository root. a=backout Backed out changeset c2b76f322973 (bug 1900345) Backed out changeset 694338ffad92 (bug 1900345) --- gradle/wrapper/gradle-wrapper.properties | 6 +++++- gradlew | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 6 +++++- mobile/android/android-components/gradlew | 2 +- .../android/android-components/plugins/config/build.gradle | 2 +- .../android-components/plugins/dependencies/build.gradle | 2 +- .../plugins/publicsuffixlist/build.gradle | 2 +- .../android/fenix/gradle/wrapper/gradle-wrapper.properties | 6 +++++- mobile/android/fenix/gradlew | 2 +- mobile/android/fenix/plugins/apksize/build.gradle | 2 +- mobile/android/fenix/plugins/fenixdependencies/build.gradle | 2 +- .../focus-android/gradle/wrapper/gradle-wrapper.properties | 6 +++++- mobile/android/focus-android/gradlew | 2 +- .../focus-android/plugins/focusdependencies/build.gradle | 2 +- 14 files changed, 30 insertions(+), 14 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c96c..23e87f9b0b22 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,10 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf13397a..1aa94a426907 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties b/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties index a4413138c96c..23e87f9b0b22 100644 --- a/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,10 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/mobile/android/android-components/gradlew b/mobile/android/android-components/gradlew index b740cf13397a..1aa94a426907 100755 --- a/mobile/android/android-components/gradlew +++ b/mobile/android/android-components/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/mobile/android/android-components/plugins/config/build.gradle b/mobile/android/android-components/plugins/config/build.gradle index 887cf2fcddb8..4efe5b3b2f72 100644 --- a/mobile/android/android-components/plugins/config/build.gradle +++ b/mobile/android/android-components/plugins/config/build.gradle @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ plugins { - id "org.gradle.kotlin.kotlin-dsl" version "4.3.1" + id "org.gradle.kotlin.kotlin-dsl" version "4.2.1" } repositories { diff --git a/mobile/android/android-components/plugins/dependencies/build.gradle b/mobile/android/android-components/plugins/dependencies/build.gradle index 452dd3a97e8e..836861b915d3 100644 --- a/mobile/android/android-components/plugins/dependencies/build.gradle +++ b/mobile/android/android-components/plugins/dependencies/build.gradle @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ plugins { - id "org.gradle.kotlin.kotlin-dsl" version "4.3.1" + id "org.gradle.kotlin.kotlin-dsl" version "4.2.1" } repositories { diff --git a/mobile/android/android-components/plugins/publicsuffixlist/build.gradle b/mobile/android/android-components/plugins/publicsuffixlist/build.gradle index 578d454bd6b2..288e3510780b 100644 --- a/mobile/android/android-components/plugins/publicsuffixlist/build.gradle +++ b/mobile/android/android-components/plugins/publicsuffixlist/build.gradle @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ plugins { - id "org.gradle.kotlin.kotlin-dsl" version "4.3.1" + id "org.gradle.kotlin.kotlin-dsl" version "4.2.1" } repositories { diff --git a/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties b/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties index a4413138c96c..23e87f9b0b22 100644 --- a/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,10 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/mobile/android/fenix/gradlew b/mobile/android/fenix/gradlew index b740cf13397a..1aa94a426907 100755 --- a/mobile/android/fenix/gradlew +++ b/mobile/android/fenix/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/mobile/android/fenix/plugins/apksize/build.gradle b/mobile/android/fenix/plugins/apksize/build.gradle index 6b2ec864e783..f9d4b5d40485 100644 --- a/mobile/android/fenix/plugins/apksize/build.gradle +++ b/mobile/android/fenix/plugins/apksize/build.gradle @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ plugins { - id "org.gradle.kotlin.kotlin-dsl" version "4.3.1" + id "org.gradle.kotlin.kotlin-dsl" version "4.2.1" } repositories { diff --git a/mobile/android/fenix/plugins/fenixdependencies/build.gradle b/mobile/android/fenix/plugins/fenixdependencies/build.gradle index db265d367bbe..d377cc41187f 100644 --- a/mobile/android/fenix/plugins/fenixdependencies/build.gradle +++ b/mobile/android/fenix/plugins/fenixdependencies/build.gradle @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ plugins { - id "org.gradle.kotlin.kotlin-dsl" version "4.3.1" + id "org.gradle.kotlin.kotlin-dsl" version "4.2.1" } repositories { diff --git a/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties index a4413138c96c..23e87f9b0b22 100644 --- a/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,10 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/mobile/android/focus-android/gradlew b/mobile/android/focus-android/gradlew index b740cf13397a..1aa94a426907 100755 --- a/mobile/android/focus-android/gradlew +++ b/mobile/android/focus-android/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/mobile/android/focus-android/plugins/focusdependencies/build.gradle b/mobile/android/focus-android/plugins/focusdependencies/build.gradle index f431ff67b522..7b9006f55c7e 100644 --- a/mobile/android/focus-android/plugins/focusdependencies/build.gradle +++ b/mobile/android/focus-android/plugins/focusdependencies/build.gradle @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ plugins { - id "org.gradle.kotlin.kotlin-dsl" version "4.3.1" + id "org.gradle.kotlin.kotlin-dsl" version "4.2.1" } repositories {