From 5c7b5216f46616565929fab62b799405fe73842c Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Tue, 30 Nov 2021 16:03:44 -0800 Subject: [PATCH] Updated android gradle plugin 4.2.0 -> 7.0.1 --- android/build.gradle | 26 -------------------------- core/build.gradle | 2 +- excel/excel-test/build.gradle | 4 ++-- gradle.properties | 2 +- table/integration/build.gradle | 4 ++-- 5 files changed, 6 insertions(+), 32 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ec7f299a..820b3db7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -111,29 +111,3 @@ task run(type: Exec) { def adb = path + "/platform-tools/adb" commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.riiablo/com.riiablo.AndroidLauncher' } - -// sets up the Android Idea project, using the old Ant based build. -idea { - module { - sourceDirs += file('src'); - scopes = [COMPILE: [plus: [project.configurations.compile]]] - - iml { - withXml { - def node = it.asNode() - def builder = NodeBuilder.newInstance(); - builder.current = node; - builder.component(name: "FacetManager") { - facet(type: "android", name: "Android") { - configuration { - option(name: "UPDATE_PROPERTY_FILES", value: "true") - } - } - } - } - } - } -} - -dependencies { -} diff --git a/core/build.gradle b/core/build.gradle index b66fcb62..dee4a47f 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -16,7 +16,7 @@ project.ext.generatedSourceDir = file("$buildDir/generated-src/main/java/") sourceSets.main.java.srcDirs += generatedSourceDir idea.module.generatedSourceDirs += generatedSourceDir -project.ext.annotationProcessorGeneratedSourcesDirectory = compileJava.options.generatedSourceOutputDirectory +project.ext.annotationProcessorGeneratedSourcesDirectory = compileJava.options.generatedSourceOutputDirectory.getAsFile().get() sourceSets.main.java.srcDirs += annotationProcessorGeneratedSourcesDirectory idea.module.generatedSourceDirs += annotationProcessorGeneratedSourcesDirectory diff --git a/excel/excel-test/build.gradle b/excel/excel-test/build.gradle index 9af949ef..77852eca 100644 --- a/excel/excel-test/build.gradle +++ b/excel/excel-test/build.gradle @@ -1,5 +1,5 @@ -sourceSets.main.java.srcDirs += compileJava.options.generatedSourceOutputDirectory -idea.module.generatedSourceDirs += compileJava.options.generatedSourceOutputDirectory +sourceSets.main.java.srcDirs += compileJava.options.generatedSourceOutputDirectory.getAsFile().get() +idea.module.generatedSourceDirs += compileJava.options.generatedSourceOutputDirectory.getAsFile().get() dependencies { annotationProcessor project(':excel:annotation-processor') diff --git a/gradle.properties b/gradle.properties index cb3348bd..a3a5e6b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms512M -Xmx1G -XX:MaxPermSize=1G -XX:MaxMetaspaceSize=1G org.gradle.configureondemand=false -androidBuildToolsPluginVersion=4.2.0 +androidBuildToolsPluginVersion=7.0.1 flatbuffersPluginVersion=1.0.7 gdxVersion=1.10.0 gdxControllersVersion=2.2.0 diff --git a/table/integration/build.gradle b/table/integration/build.gradle index 0ab6b368..9ccd5ad7 100644 --- a/table/integration/build.gradle +++ b/table/integration/build.gradle @@ -1,5 +1,5 @@ -sourceSets.main.java.srcDirs += compileJava.options.generatedSourceOutputDirectory -idea.module.generatedSourceDirs += compileJava.options.generatedSourceOutputDirectory +sourceSets.main.java.srcDirs += compileJava.options.generatedSourceOutputDirectory.getAsFile().get() +idea.module.generatedSourceDirs += compileJava.options.generatedSourceOutputDirectory.getAsFile().get() dependencies { annotationProcessor project(':table:annotation-processor')