From f47a1d27867415a133400d32652627042510f82e Mon Sep 17 00:00:00 2001
From: hiram <hiram@fanruan.com>
Date: Tue, 2 Jun 2020 09:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20gradle?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index ebec6e7705..0112687676 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,11 +14,12 @@ ext {
     languageLevelSetting = 1.8
 }
 
-apply from: 'globalConfigHook.gradle'
+applyGlobalConfigPathIfExist()
 
-if(versions.frVersion){
-    frVersion =  versions.frVersion
+if (versions.frVersion) {
+    frVersion = versions.frVersion
 }
+def frDevVersion = "DEV" + frVersion
 
 dependencies {
     api project(':designer-base')
@@ -33,7 +34,7 @@ allprojects {
     apply plugin: 'idea'
 
     group 'com.fr.design'
-    version frVersion
+    version frDevVersion
     sourceCompatibility = languageLevelSetting
     targetCompatibility  = languageLevelSetting
 
@@ -72,7 +73,7 @@ allprojects {
         implementation 'com.fr.datasource:fine-datasource:' + frVersion
         implementation 'com.fr.decision:fine-decision:' + frVersion
         implementation 'com.fr.schedule:fine-schedule:' + frVersion
-        implementation 'com.fr.report:fine-report-engine:' + frVersion
+        implementation 'com.fr.report:fine-report-engine:' + frDevVersion
         testImplementation 'org.easymock:easymock:3.5.1'
         testImplementation 'org.powermock:powermock-module-junit4:1.7.1'
         testImplementation 'org.powermock:powermock-api-easymock:1.7.1'