From 2d2ab26a3ed57f3b41037ccaad28171ca0d656f9 Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Fri, 12 Jun 2020 15:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6gradle=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore      |   6 ++-
 build.xml       | 128 ------------------------------------------------
 pom.xml         |  38 --------------
 settings.gradle |   5 ++
 4 files changed, 9 insertions(+), 168 deletions(-)
 delete mode 100644 build.xml
 delete mode 100644 pom.xml
 create mode 100644 settings.gradle

diff --git a/.gitignore b/.gitignore
index 0446c30..29c9cac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 *.iml
 .idea/
 lib/report/*.jar
+target/
 .DS_Store
-.classpath
 .gradle
 build
-local.properties
\ No newline at end of file
+local.properties
+classes/
+transform-classes/
\ No newline at end of file
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 586ab53..0000000
--- a/build.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="jar" name="plugin">
-    <!-- JDK路径，根据自己机器上实际位置修改-->
-    <property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_211.jdk/Contents/Home"/>
-
-    <property name="libs" value="${basedir}/lib"/>
-    <property name="publicLibs" value=""/>
-    <property name="reportLibs" value="${basedir}/lib/report"/>
-    <property name="destLoc" value="."/>
-    <property name="classes" value="classes"/>
-    <xmlproperty file="${basedir}/plugin.xml"/>
-    <property name="plugin.version" value="1.0.0"/>
-    <property name="plugin.name" value="DEMO_CHART"/>
-    <property name="current-version" value="${plugin.version}"/>
-
-    <!-- 插件版本-->
-    <property name="plugin-version" value="${current-version}"/>
-    <!-- 插件名字-->
-    <property name="plugin-name" value="extendedCharts"/>
-    <property name="plugin-jar" value="fr-plugin-${plugin-name}-${plugin-version}.jar"/>
-
-    <target name="prepare">
-        <delete dir="${classes}"/>
-        <delete dir="fr-plugin-${plugin-name}-${plugin-version}"/>
-        <xmlproperty file="${basedir}/plugin.xml"/>
-        <delete dir="${destLoc}/${plugin.name}"/>
-    </target>
-    <path id="compile.classpath">
-        <fileset dir="${libs}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${publicLibs}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <!--<fileset dir="${reportLibs}">-->
-        <!--<include name="**/*.jar"/>-->
-        <!--</fileset>-->
-    </path>
-    <patternset id="resources4Jar">
-        <exclude name="**/.settings/**"/>
-        <exclude name=".classpath"/>
-        <exclude name=".project"/>
-
-        <exclude name="**/*.java"/>
-        <exclude name="**/*.db"/>
-        <exclude name="**/*.g"/>
-        <exclude name="**/package.html"/>
-    </patternset>
-    <target name="copy_resources">
-        <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
-        <delete dir="tmp"/>
-        <copy todir="tmp">
-            <fileset dir="${resources_from}/src/main/resources">
-                <patternset refid="resources4Jar"/>
-            </fileset>
-        </copy>
-        <copy todir="${classes}">
-            <fileset dir="tmp"/>
-        </copy>
-        <delete dir="tmp"/>
-    </target>
-    <target name="compile_javas">
-        <echo message="编译${compile_files}下的Java文件"/>
-        <javac destdir="${classes}" debug="false" includeantruntime="false" optimize="on" source="${source_jdk_version}"
-               target="${target_jdk_version}"
-               fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
-               executable="${compile_jdk_version}/bin/javac">
-            <src path="${basedir}/src/main/java"/>
-            <exclude name="**/.svn/**"/>
-            <compilerarg line="-encoding UTF8 "/>
-            <classpath refid="compile.classpath"/>
-        </javac>
-    </target>
-
-    <target name="jar_classes">
-        <echo message="打Jar包:${jar_name}"/>
-        <delete file="${basedir}/${jar_name}"/>
-        <jar jarfile="${basedir}/${jar_name}">
-            <fileset dir="${classes}">
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="super_jar" depends="prepare">
-        <antcall target="copy_resources">
-            <param name="resources_from" value="${basedir}"/>
-        </antcall>
-        <antcall target="compile_javas">
-            <param name="source_jdk_version" value="1.6"/>
-            <param name="target_jdk_version" value="1.6"/>
-            <param name="compile_jdk_version" value="${jdk.home}"/>
-            <param name="compile_files" value="${basedir}/src"/>
-        </antcall>
-        <echo message="compile plugin success!"/>
-
-        <antcall target="jar_classes">
-            <param name="jar_name" value="${plugin-jar}"/>
-        </antcall>
-        <delete dir="${classes}"/>
-
-    </target>
-
-    <target name="jar" depends="super_jar">
-        <antcall target="zip"/>
-    </target>
-
-    <target name="zip">
-        <property name="plugin-folder" value="fr-plugin-${plugin-name}-${plugin-version}"/>
-        <echo message="----------zip files----------"/>
-        <mkdir dir="${plugin-folder}"/>
-        <copy todir="${plugin-folder}">
-            <fileset dir=".">
-                <include name="${plugin-jar}"/>
-                <include name="plugin.xml"/>
-            </fileset>
-            <fileset dir="${libs}">
-                <include name="*.jar"/>
-                <include name="*.dll"/>
-            </fileset>
-        </copy>
-        <zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
-            <include name="${plugin-folder}/*.jar"/>
-            <include name="${plugin-folder}/*.dll"/>
-            <include name="${plugin-folder}/plugin.xml"/>
-        </zip>
-        <move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index cfbc810..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.fr.plugin</groupId>
-        <artifactId>starter</artifactId>
-        <version>10.0</version>
-    </parent>
-    <artifactId>demo-chart-pie</artifactId>
-    <packaging>jar</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>com.fanruan.api</groupId>
-            <artifactId>finekit</artifactId>
-            <version>1.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/finekit-10.0.jar</systemPath>
-        </dependency>
-    </dependencies>
-    <build>
-        <!---如果要更改调试插件，改这里的配置就可以了-->
-        <outputDirectory>
-            ${project.basedir}/../finereport-maven/start/webapps/webroot/WEB-INF/plugins/plugin-com.fr.plugin.demoChart-1.0.0/classes
-        </outputDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..346c10e
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'demo-chart-pie'