From 719643840403dbfd267c28361f6071a0d567386a Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Mon, 16 Dec 2019 13:07:30 +0100 Subject: [PATCH] fix idea static analysis --- deps4j/build.gradle | 2 + simplecfg/build.gradle | 98 +++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/deps4j/build.gradle b/deps4j/build.gradle index 87727a2..b85cc8a 100644 --- a/deps4j/build.gradle +++ b/deps4j/build.gradle @@ -18,6 +18,8 @@ repositories { idea { module { generatedSourceDirs += file('./src/gen/java') + sourceDirs += file('../extendj/src/frontend') + sourceDirs += file('../extendj/src/frontend-main') } } diff --git a/simplecfg/build.gradle b/simplecfg/build.gradle index fc3bd9d..5c4e047 100644 --- a/simplecfg/build.gradle +++ b/simplecfg/build.gradle @@ -1,9 +1,9 @@ buildscript { - repositories.mavenLocal() - repositories.mavenCentral() - dependencies { - classpath 'org.jastadd:jastaddgradle:1.13.3' - } + repositories.mavenLocal() + repositories.mavenCentral() + dependencies { + classpath 'org.jastadd:jastaddgradle:1.13.3' + } } apply plugin: 'java' @@ -12,73 +12,74 @@ apply plugin: 'jastadd' apply plugin: 'idea' repositories { - mavenLocal() + mavenLocal() } idea { - module { - generatedSourceDirs += file('./src/gen/java') - } + module { + generatedSourceDirs += file('./src/gen/java') + sourceDirs += file('../extendj/src/frontend') + sourceDirs += file('../extendj/src/frontend-main') + } } sourceSets.main { - java { - - srcDirs "src/gen/java" - srcDirs '../extendj/src/frontend' - srcDirs '../extendj/src/frontend-main' - } - resources { - srcDir '../extendj/src/res' - srcDir jastadd.buildInfoDir - } + java { + + srcDirs "src/gen/java" + srcDirs '../extendj/src/frontend' + srcDirs '../extendj/src/frontend-main' + } + resources { + srcDir '../extendj/src/res' + srcDir jastadd.buildInfoDir + } } dependencies { -// compile group: 'com.google.guava', name: 'guava', version: '18.0' - testCompile group: 'com.google.truth', name: 'truth', version: '0.27' + testCompile group: 'com.google.truth', name: 'truth', version: '0.27' } jastadd { - configureModuleBuild() + configureModuleBuild() - modules { + modules { - include("../extendj/jastadd_modules") + include("../extendj/jastadd_modules") - module "simplecfg", { + module "simplecfg", { - imports "java8 frontend" + imports "java8 frontend" - jastadd { - basedir "src/main/jastadd/" - include "**/*.ast" - include "**/*.jadd" - include "**/*.jrag" - } + jastadd { + basedir "src/main/jastadd/" + include "**/*.ast" + include "**/*.jadd" + include "**/*.jrag" + } - java { - basedir "src/main/java/" - include "**/*.java" - } + java { + basedir "src/main/java/" + include "**/*.java" + } - } + } - } + } - // Target module to build: - module = 'simplecfg' + // Target module to build: + module = 'simplecfg' - astPackage = 'org.extendj.ast' - parser.name = 'JavaParser' - scanner.name = 'OriginalScanner' + astPackage = 'org.extendj.ast' + parser.name = 'JavaParser' + scanner.name = 'OriginalScanner' - genDir = 'src/gen/java' + genDir = 'src/gen/java' - parser.genDir = 'src/gen/java/org/extendj/parser' - scanner.genDir = 'src/gen/java/org/extendj/scanner' + parser.genDir = 'src/gen/java/org/extendj/parser' + scanner.genDir = 'src/gen/java/org/extendj/scanner' // // if (project.hasProperty('extraJastAddOptions')) { // extraJastAddOptions += project.extraJastAddOptions.split(',') as List @@ -89,7 +90,7 @@ jastadd { test { - inputs.dir file('testdata') + inputs.dir file('testdata') } mainClassName = 'com.google.simplecfg.PrintCfg' @@ -98,6 +99,3 @@ jar.destinationDir = projectDir sourceCompatibility = '1.8' targetCompatibility = '1.8' - -// fix broken scanner dependencies -//scanner.outputs.upToDateWhen {false} -- GitLab