diff --git a/build.gradle.kts b/build.gradle.kts index ec52ec2..4d78a52 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,17 +1,17 @@ -task("clean", type = Delete::class) { - delete(buildDir) +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) } subprojects { group = "dev.rikka.tools.autoresconfig" - version = "1.2.1" + version = "1.3.0" plugins.withId("java") { println("- Configuring `java`") extensions.configure { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.register("sourcesJar", type = Jar::class) { archiveClassifier.set("sources") @@ -61,7 +61,8 @@ subprojects { mavenLocal() maven { name = "ossrh" - url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2") + url = + uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2") credentials(PasswordCredentials::class.java) } } @@ -75,7 +76,8 @@ subprojects { if (findProperty("signing.gnupg.keyName") != null) { useGpgCmd() - val signingTasks = sign(extensions.getByType().publications) + val signingTasks = + sign(extensions.getByType().publications) tasks.withType(AbstractPublishToMaven::class) { dependsOn(signingTasks) } @@ -85,3 +87,7 @@ subprojects { } } } +tasks.named("updateDaemonJvm") { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.ADOPTIUM +} diff --git a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/AutoResConfigPlugin.java b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/AutoResConfigPlugin.java index 2333eed..3ed6e4a 100644 --- a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/AutoResConfigPlugin.java +++ b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/AutoResConfigPlugin.java @@ -1,20 +1,21 @@ package dev.rikka.tools.autoresconfig; -import com.android.build.gradle.AppExtension; -import com.android.build.gradle.api.ApplicationVariant; -import com.android.builder.core.AbstractProductFlavor; +import com.android.build.api.dsl.ApplicationExtension; +import com.android.build.api.variant.AndroidComponentsExtension; +import com.android.build.api.variant.ApplicationAndroidComponentsExtension; +import com.android.build.api.variant.ApplicationVariant; + import org.gradle.api.GradleException; import org.gradle.api.Plugin; import org.gradle.api.Project; +import org.gradle.api.file.Directory; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; -import org.gradle.api.tasks.SourceTask; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.util.*; -import java.util.stream.Collectors; @SuppressWarnings("unused") public class AutoResConfigPlugin implements Plugin { @@ -34,7 +35,7 @@ private void collectModifiers(File dir, Collection output) throws IOExce return; } - logger.debug("AutoResConfig: Collect modifiers from " + dir); + logger.debug("AutoResConfig: Collect modifiers from {}", dir); try (var stream = Files.list(dir.toPath())) { output.addAll(stream @@ -54,19 +55,22 @@ private void collectModifiers(File dir, Collection output) throws IOExce .map(java.nio.file.Path::getFileName) .map(path -> path.toFile().getName().substring("values-".length())) .filter(s -> s.split("-").length <= 3) - .collect(Collectors.toList())); + .toList()); } } - private Collection collectModifiers(@SuppressWarnings("deprecation") ApplicationVariant variant) { + private Collection collectModifiers(ApplicationVariant variant) { var set = new HashSet(); set.add("en"); - Set resDirs = new HashSet<>(); - variant.getSourceSets().forEach(sourceProvider -> resDirs.addAll(sourceProvider.getResDirectories())); + Set resDirs = new HashSet<>(); + var res = variant.getSources().getRes(); + if (res != null) { + res.getStatic().get().forEach(resDirs::addAll); + } - for (File dir : resDirs) { - Set modifiers = modifierCache.get(dir.getAbsolutePath()); + for (var dir : resDirs) { + Set modifiers = modifierCache.get(dir.getAsFile().getAbsolutePath()); if (modifiers != null) { set.addAll(modifiers); } @@ -77,20 +81,6 @@ private Collection collectModifiers(@SuppressWarnings("deprecation") App return list; } - private boolean updateResConfig(@SuppressWarnings("deprecation") ApplicationVariant variant, Collection modifiers) { - var mergedFlavor = variant.getMergedFlavor(); - - //noinspection deprecation - if (mergedFlavor instanceof AbstractProductFlavor) { - //noinspection deprecation - var flavor = (AbstractProductFlavor) mergedFlavor; - flavor.addResourceConfigurations(modifiers); - return true; - } else { - return false; - } - } - private Collection convertModifiersToLocales(Collection modifiers) { var locales = new ArrayList(); @@ -135,7 +125,7 @@ private Collection convertLocalesToDisplayLocales(Collection loc @Override public void apply(Project project) { - var appExtension = project.getExtensions().findByType(AppExtension.class); + var appExtension = project.getExtensions().findByType(ApplicationExtension.class); if (appExtension == null) throw new GradleException("Android application extension not found"); var extension = project.getExtensions().create( @@ -145,11 +135,10 @@ public void apply(Project project) { modifierCache.clear(); appExtension.getSourceSets().all(sourceSet -> { - Set mainModifiers = null; - - logger.info("AutoResConfig: Collect locale modifiers for " + sourceSet.getName()); + logger.info("AutoResConfig: Collect locale modifiers for {}", sourceSet.getName()); - for (File dir : sourceSet.getRes().getSrcDirs()) { + for (var path : sourceSet.getRes().getDirectories()) { + var dir = project.getLayout().getProjectDirectory().dir(path).getAsFile(); var absolutePath = dir.getAbsolutePath(); var set = modifierCache.get(absolutePath); @@ -163,91 +152,95 @@ public void apply(Project project) { try { collectModifiers(dir, set); } catch (IOException e) { - logger.error("AutoResConfig: Failed to collect modifiers from " + dir, e); - } - - if (sourceSet.getName().equals("main")) { - mainModifiers = set; - } - } - - if (sourceSet.getName().equals("main")) { - if (mainModifiers != null) { - var list = new ArrayList<>(mainModifiers); - list.sort(String.CASE_INSENSITIVE_ORDER); - - appExtension.getDefaultConfig().resConfigs(list); - logger.info("AutoResConfig: Update default resConfig " + mainModifiers); - } else { - logger.warn("AutoResConfig: mainModifiers is null"); + logger.error("AutoResConfig: Failed to collect modifiers from {}", dir, e); } } }); - appExtension.getApplicationVariants().all(variant -> { - var variantName = variant.getName(); - var variantNameCapitalized = Util.capitalize(variantName); + var androidComponents = project.getExtensions().findByType(AndroidComponentsExtension.class); + if (androidComponents instanceof ApplicationAndroidComponentsExtension componentsExtension) { + componentsExtension.onVariants(androidComponents.selector().all(), variant -> { + var variantName = variant.getName(); + var variantNameCapitalized = Util.capitalize(variantName); - logger.info("AutoResConfig: Variant " + variantName); - logger.info("AutoResConfig: " + extension); + logger.info("AutoResConfig: Variant {}", variantName); + logger.info("AutoResConfig: {}", extension); - var modifiers = collectModifiers(variant); + var modifiers = collectModifiers(variant); - if (updateResConfig(variant, modifiers)) { - logger.info("AutoResConfig: Update resConfig " + modifiers); - } else { - logger.error("AutoResConfig: Failed to update resConfig"); - } + variant.getAndroidResources() + .getLocaleFilters() + .addAll(modifiers); - var locales = convertModifiersToLocales(modifiers); - var displayLocales = convertLocalesToDisplayLocales(locales); - logger.info("AutoResConfig: Locales " + locales); - logger.info("AutoResConfig: Display locales " + displayLocales); + var locales = convertModifiersToLocales(modifiers); + var displayLocales = convertLocalesToDisplayLocales(locales); + logger.info("AutoResConfig: Locales {}", locales); + logger.info("AutoResConfig: Display locales {}", displayLocales); - if (extension.getGenerateClass().get()) { - var javaSourceDir = new File(project.getBuildDir(), - String.format("generated/auto_res_config/%s/java", variantName)); + if (extension.getGenerateClass().get()) { + var javaSourceDir = project.getLayout().getBuildDirectory() + .dir(String.format("generated/auto_res_config/%s/java", variantName)); - var taskName = String.format("generate%sAutoResConfigSource", variantNameCapitalized); + var taskName = String.format("generate%sAutoResConfigSource", variantNameCapitalized); - var generateJavaTask = project.getTasks().register(taskName, - GenerateJavaTask.class, extension, javaSourceDir, locales, displayLocales); + var task = project.getTasks().register(taskName, + GenerateJavaTask.class, t -> { + t.getExtension().set(extension); + t.getOutputDir().set(javaSourceDir); + t.getLocales().set(locales); + t.getDisplayLocales().set(displayLocales); + }); - variant.registerJavaGeneratingTask(generateJavaTask, javaSourceDir); + var java = variant.getSources().getJava(); + if (java != null) { + java.addGeneratedSourceDirectory(task, GenerateJavaTask::getOutputDir); + } - logger.info("AutoResConfig: register " + taskName + " " + javaSourceDir); - } + logger.info("AutoResConfig: register {} {}", taskName, javaSourceDir); + } - if (extension.getGenerateRes().get()) { - var resDir = new File(project.getBuildDir(), - String.format("generated/auto_res_config/%s/res", variantName)); + if (extension.getGenerateRes().get()) { + var resDir = project.getLayout().getBuildDirectory() + .dir(String.format("generated/auto_res_config/%s/res", variantName)); - var taskName = String.format("generate%sAutoResConfigRes", variantNameCapitalized); + var taskName = String.format("generate%sAutoResConfigRes", variantNameCapitalized); - var generateResTask = project.getTasks().register(taskName, - GenerateResTask.class, extension, resDir, locales, displayLocales); + var task = project.getTasks().register(taskName, GenerateResTask.class, t -> { + t.getExtension().set(extension); + t.getOutputDir().set(resDir); + t.getLocales().set(locales); + t.getDisplayLocales().set(displayLocales); + }); - variant.registerGeneratedResFolders( - project.files(resDir).builtBy(generateResTask)); + var res = variant.getSources().getRes(); + if (res != null) { + res.addGeneratedSourceDirectory(task, GenerateResTask::getOutputDir); + } - logger.info("AutoResConfig: register " + taskName + " " + resDir); - } + logger.info("AutoResConfig: register {} {}", taskName, resDir); + } - if (extension.getGenerateLocaleConfig().get()) { - var resDir = new File(project.getBuildDir(), - String.format("generated/auto_res_config/%s/res", variantName)); + if (extension.getGenerateLocaleConfig().get()) { + var resDir = project.getLayout().getBuildDirectory() + .dir(String.format("generated/auto_res_config/%s/res", variantName)); - var taskName = String.format("generate%sAutoResConfigLocaleConfigRes", variantNameCapitalized); + var taskName = String.format("generate%sAutoResConfigLocaleConfigRes", variantNameCapitalized); - var generateResTask = project.getTasks().register(taskName, - GenerateLocaleConfigResTask.class, resDir, locales, displayLocales); + var task = project.getTasks().register(taskName, GenerateLocaleConfigResTask.class, t -> { + t.getOutputDir().set(resDir); + t.getLocales().set(locales); + t.getDisplayLocales().set(displayLocales); + }); - variant.registerGeneratedResFolders( - project.files(resDir).builtBy(generateResTask)); + var res = variant.getSources().getRes(); + if (res != null) { + res.addGeneratedSourceDirectory(task, GenerateLocaleConfigResTask::getOutputDir); + } - logger.info("AutoResConfig: register " + taskName + " " + resDir); - } - }); + logger.info("AutoResConfig: register {} {}", taskName, resDir); + } + }); + } } } diff --git a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateJavaTask.java b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateJavaTask.java index 9e83685..fd79ae1 100644 --- a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateJavaTask.java +++ b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateJavaTask.java @@ -1,54 +1,59 @@ package dev.rikka.tools.autoresconfig; -import javax.inject.Inject; -import java.io.File; +import org.gradle.api.file.DirectoryProperty; +import org.gradle.api.provider.ListProperty; +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.OutputDirectory; + import java.io.IOException; import java.io.PrintStream; -import java.util.Collection; import java.util.stream.Collectors; -public class GenerateJavaTask extends GenerateTask { +public abstract class GenerateJavaTask extends GenerateTask { + @Input + public abstract ListProperty getLocales(); - private final AutoResConfigExtension extension; - private final File file; + @Input + public abstract ListProperty getDisplayLocales(); - @Inject - public GenerateJavaTask(AutoResConfigExtension extension, File dir, - Collection locales, Collection displayLocales) { - super(dir, locales, displayLocales); + @Input + public abstract Property getExtension(); - this.extension = extension; - this.file = new File(dir, String.format("%s.java", - String.join("/", extension.getGeneratedClassFullName().get().split("\\.")))); - } + @OutputDirectory + public abstract DirectoryProperty getOutputDir(); @Override public void generate() throws IOException { super.generate(); - + var extension = getExtension().get(); + var file = getOutputDir().file(String.format("%s.java", + String.join("/", extension.getGeneratedClassFullName().get().split("\\.")))).get().getAsFile(); createFile(file); var os = new PrintStream(file); - write(os); + write(os, extension); os.flush(); os.close(); } - public void write(PrintStream os) { - String content = "package %s;\n" + - "\n" + - "public final class %s {\n" + - " public static final String[] LOCALES = {%s%s};\n" + - " public static final String[] DISPLAY_LOCALES = {%s%s};\n" + - "}\n"; + public void write(PrintStream os, AutoResConfigExtension extension) { + String content = """ + package %s; + + public final class %s { + public static final String[] LOCALES = {%s%s}; + public static final String[] DISPLAY_LOCALES = {%s%s}; + } + """; var generatedClassFullName = extension.getGeneratedClassFullName().get(); var index = generatedClassFullName.lastIndexOf('.'); var packageName = generatedClassFullName.substring(0, index); var className = generatedClassFullName.substring(index + 1); - var localesString = locales.stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(",")); - var displayLocalesString = displayLocales.stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(",")); + var localesString = getLocales().get().stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(",")); + var displayLocalesString = getDisplayLocales().get().stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(",")); var firstItem = extension.getGeneratedArrayFirstItem().getOrElse("").isEmpty() ? "" : ("\"" + extension.getGeneratedArrayFirstItem().get() + "\","); diff --git a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateLocaleConfigResTask.java b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateLocaleConfigResTask.java index 1a730c4..34050b9 100644 --- a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateLocaleConfigResTask.java +++ b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateLocaleConfigResTask.java @@ -1,27 +1,26 @@ package dev.rikka.tools.autoresconfig; -import javax.inject.Inject; -import java.io.File; +import org.gradle.api.file.DirectoryProperty; +import org.gradle.api.provider.ListProperty; +import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.OutputDirectory; + import java.io.IOException; import java.io.PrintStream; -import java.util.Collection; import java.util.stream.Collectors; -public class GenerateLocaleConfigResTask extends GenerateTask { - - private final File file; +public abstract class GenerateLocaleConfigResTask extends GenerateTask { - @Inject - public GenerateLocaleConfigResTask(File dir, Collection locales, Collection displayLocales) { - super(dir, locales, displayLocales); + @Input + public abstract ListProperty getLocales(); - this.file = new File(dir, "xml/locales_config.xml"); - } + @OutputDirectory + public abstract DirectoryProperty getOutputDir(); @Override public void generate() throws IOException { super.generate(); - + var file = getOutputDir().file("xml/locales_config.xml").get().getAsFile(); createFile(file); var os = new PrintStream(file); @@ -31,12 +30,14 @@ public void generate() throws IOException { } public void write(PrintStream os) { - String content = "\n" + - "\n" + - "%s\n" + - "\n"; - - var localesString = locales.stream().map(s -> "").collect(Collectors.joining("\n")); + String content = """ + + + %s + + """; + + var localesString = getLocales().get().stream().map(s -> "").collect(Collectors.joining("\n")); os.printf(content, localesString); } diff --git a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateResTask.java b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateResTask.java index 09ce3c4..202de62 100644 --- a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateResTask.java +++ b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateResTask.java @@ -1,51 +1,57 @@ package dev.rikka.tools.autoresconfig; -import javax.inject.Inject; -import java.io.File; +import org.gradle.api.file.DirectoryProperty; +import org.gradle.api.provider.ListProperty; +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.OutputDirectory; + import java.io.IOException; import java.io.PrintStream; -import java.util.Collection; import java.util.stream.Collectors; -public class GenerateResTask extends GenerateTask { +public abstract class GenerateResTask extends GenerateTask { + @Input + public abstract ListProperty getLocales(); - private final AutoResConfigExtension extension; - private final File file; + @Input + public abstract ListProperty getDisplayLocales(); - @Inject - public GenerateResTask(AutoResConfigExtension extension, File dir, Collection locales, Collection displayLocales) { - super(dir, locales, displayLocales); + @Input + public abstract Property getExtension(); - this.extension = extension; - this.file = new File(dir, "values/arrays.xml"); - } + @OutputDirectory + public abstract DirectoryProperty getOutputDir(); @Override public void generate() throws IOException { super.generate(); - + var extension = getExtension().get(); + var file = getOutputDir().file("values/arrays.xml").get().getAsFile(); createFile(file); var os = new PrintStream(file); - write(os); + write(os, extension); os.flush(); os.close(); } - public void write(PrintStream os) { - String content = "\n" + - "\n" + - "\n" + - "%s%s\n" + - "\n" + - "\n" + - "%s%s\n" + - "\n" + - "\n"; + public void write(PrintStream os, AutoResConfigExtension extension) { + String content = """ + + + + %s%s + + + %s%s + + + """; var prefix = extension.getGeneratedResPrefix().getOrElse(""); - var localesString = locales.stream().map(s -> "" + s + "").collect(Collectors.joining("\n")); - var displayLocalesString = displayLocales.stream().map(s -> "" + s + "").collect(Collectors.joining("\n")); + var localesString = getLocales().get().stream().map(s -> "" + s + "").collect(Collectors.joining("\n")); + var displayLocalesString = getDisplayLocales().get().stream().map(s -> "" + s + "").collect(Collectors.joining("\n")); var localesResName = prefix.isEmpty() ? "locales" : prefix + "_locales"; var displayLocalesResName = prefix.isEmpty() ? "display_locales" : prefix + "_display_locales"; var firstItem = extension.getGeneratedArrayFirstItem().getOrElse("").isEmpty() ? "" diff --git a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateTask.java b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateTask.java index a6781c5..513275d 100644 --- a/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateTask.java +++ b/gradle-plugin/src/main/java/dev/rikka/tools/autoresconfig/GenerateTask.java @@ -1,49 +1,52 @@ package dev.rikka.tools.autoresconfig; +import static java.nio.file.Files.delete; + import org.gradle.api.DefaultTask; +import org.gradle.api.file.DirectoryProperty; +import org.gradle.api.file.FileVisitDetails; +import org.gradle.api.file.FileVisitor; +import org.gradle.api.provider.ListProperty; +import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.TaskAction; +import org.jspecify.annotations.NonNull; -import javax.inject.Inject; import java.io.File; import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.Collection; public abstract class GenerateTask extends DefaultTask { - protected final Collection locales; - protected final Collection displayLocales; - private final File dir; + @Input + public abstract ListProperty getLocales(); - @Inject - public GenerateTask(File dir, Collection locales, Collection displayLocales) { - this.locales = locales; - this.displayLocales = displayLocales; - this.dir = dir; - } + @Input + public abstract ListProperty getDisplayLocales(); + + @OutputDirectory + public abstract DirectoryProperty getOutputDir(); @TaskAction public void generate() throws IOException { - try { - Files.walkFileTree(dir.toPath(), new SimpleFileVisitor<>() { - @Override - public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - Files.delete(dir); - return FileVisitResult.CONTINUE; - } + getOutputDir().getAsFileTree().visit( + new FileVisitor() { + @Override + public void visitDir(@NonNull FileVisitDetails dirDetails) { + try { + delete(dirDetails.getFile().toPath()); + } catch (IOException ignored) { + } + } - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - Files.delete(file); - return FileVisitResult.CONTINUE; + @Override + public void visitFile(@NonNull FileVisitDetails fileDetails) { + try { + delete(fileDetails.getFile().toPath()); + } catch (IOException ignored) { + } + } } - }); - } catch (IOException ignored) { - } + ); } public final void createFile(File file) throws IOException { diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..23de26e --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,13 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f636c800fdb3f9ae33f019dfa048ba72/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0ef34dd9312b12d61ba1b8e66126d140/redirect +toolchainVendor=ADOPTIUM +toolchainVersion=21 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..37f78a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,114 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# 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 +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,32 +59,33 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle.kts b/settings.gradle.kts index a525d7f..bfad6ed 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,6 +9,9 @@ pluginManagement { gradlePluginPortal() } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} dependencyResolutionManagement { repositories { @@ -17,7 +20,7 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - val agp = "7.0.4" + val agp = "9.0.1" library("android-gradle", "com.android.tools.build", "gradle").version(agp) }