From 87d5a20458185e779e3e1d08ee6dc67f1e31d24b Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 10 Jun 2020 11:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BD=BF=E7=94=A8gradle?= =?UTF-8?q?=E6=9E=84=E5=BB=BABI=E6=8F=92=E4=BB=B6=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +++- build.gradle | 8 ++------ gradle/wrapper/gradle-wrapper.properties | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cf2b4b8..6ab32ee 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,6 @@ classes/ transform-classes/ tomcat.* /ROOT/ -/spark_warehouse/ \ No newline at end of file +/spark_warehouse/ +ROOT/ +spark_warehouse/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 21dabe1..4247bb7 100644 --- a/build.gradle +++ b/build.gradle @@ -26,10 +26,6 @@ task install(type: Copy) { from configurations.runtimeClasspath } -static def isWindows() { - return org.gradle.internal.os.OperatingSystem.current().isWindows() -} - dependencies { implementation files("${System.getProperty('java.home')}/../lib/tools.jar") implementation 'com.fr.third:fine-third:' + fineVersion @@ -48,8 +44,8 @@ dependencies { implementation 'com.finebi:fine-bi-adapter:' + finebiVersion implementation 'com.finebi:fine-bi-engine-spider:' + finebiVersion implementation 'com.finebi:fine-bi-foundation:' + finebiVersion - implementation 'com.finebi:fine-decision-bi:' + finebiVersion - implementation 'com.finebi:fine-schedule-bi:' + finebiVersion + implementation 'com.finebi:fine-decision-bi:' + fineVersion + implementation 'com.finebi:fine-schedule-bi:' + fineVersion implementation 'org.apache.tomcat:tomcat-catalina:8.5.32' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ba94df8..14b7a10 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Jun 10 11:47:58 CST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME