Updated android gradle plugin 4.2.0 -> 7.0.1

This commit is contained in:
Collin Smith 2021-11-30 16:03:44 -08:00
parent ef89a85165
commit 5c7b5216f4
5 changed files with 6 additions and 32 deletions

View File

@ -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 {
}

View File

@ -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

View File

@ -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')

View File

@ -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

View File

@ -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')