Commit 49ed81f7 authored by Agi Sferro's avatar Agi Sferro
Browse files

Bug 1724480 - Upgrade JDK to Java 17. r=glandium,ahal,calu 

Differential Revision: https://phabricator.services.mozilla.com/D131972
parent f45d4248

build.gradle

+7 −1
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ allprojects { 
        gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->

            maven {

                url repository

                if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {

                    allowInsecureProtocol = true

                }

            }

        }

    }
@@ -94,6 +97,9 @@ buildscript { 
        gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->

            maven {

                url repository

                if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {

                    allowInsecureProtocol = true

                }

            }

        }

    }
@@ -102,7 +108,7 @@ buildscript { 


    dependencies {

        classpath 'org.mozilla.apilint:apilint:0.5.1'

        classpath 'com.android.tools.build:gradle:4.2.0'

        classpath 'com.android.tools.build:gradle:7.0.3'

        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'

        classpath 'org.apache.commons:commons-exec:1.3'

        classpath 'com.diffplug.spotless:spotless-plugin-gradle:5.16.0'

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip

# Bug 1596208, Android Studio has a bug that prevents us from using this

# distributionSha256Sum=53b71812f18cdb2777e9f1b2a0f2038683907c90bdc406bc64d8b400e1fb2c3b

mobile/android/annotations/build.gradle

+4 −4
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ buildDir "${topobjdir}/gradle/build/mobile/android/annotations" 
apply plugin: 'java'



dependencies {

    implementation 'com.android.tools.lint:lint:26.2.1'

    implementation 'com.android.tools.lint:lint-checks:26.2.1'

    implementation 'com.android.tools.lint:lint:30.0.3'

    implementation 'com.android.tools.lint:lint-checks:30.0.3'

}



sourceCompatibility = JavaVersion.VERSION_1_8

targetCompatibility = JavaVersion.VERSION_1_8
 
sourceCompatibility = JavaVersion.VERSION_11

targetCompatibility = JavaVersion.VERSION_11

mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/SDKProcessor.java

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ package org.mozilla.gecko.annotationProcessors; 
 */

import com.android.tools.lint.LintCliClient;

import com.android.tools.lint.checks.ApiLookup;

import com.android.tools.lint.client.api.LintClient;

import java.io.BufferedReader;

import java.io.File;

import java.io.FileOutputStream;
@@ -211,7 +212,7 @@ public class SDKProcessor { 
    sMaxSdkVersion = Integer.parseInt(args[1]);

    final String outdir = args[2];



    final LintCliClient lintClient = new LintCliClient();

    final LintCliClient lintClient = new LintCliClient(LintClient.CLIENT_CLI);

    sApiLookup = ApiLookup.get(lintClient);



    for (int argIndex = 3; argIndex < args.length; argIndex += 2) {

mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ NO_NDK=1 
ac_add_options --with-gradle

# We want to use (and populate!) the local Nexus repositories.

export GRADLE_MAVEN_REPOSITORIES="http://localhost:8081/nexus/content/repositories/mozilla/","http://localhost:8081/nexus/content/repositories/google/","http://localhost:8081/nexus/content/repositories/central/","http://localhost:8081/nexus/content/repositories/gradle-plugins/"

# Nexus runs on HTTP

ac_add_options --allow-insecure-gradle-repositories



# From here on, just like ../android-arm/nightly.