feat: 添加tracker module，统一包名

neuyu · Mar 5, 2018 · c4f6d4d · c4f6d4d
1 parent 2730bc4
commit c4f6d4d
Show file tree

Hide file tree

Showing 39 changed files with 755 additions and 96 deletions.
diff --git a/CodelessDA-Gradle-Plugin.iml → LazierTracker.iml b/CodelessDA-Gradle-Plugin.iml → LazierTracker.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="CodelessDA-Gradle-Plugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="LazierTracker" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

diff --git a/app/app.iml b/app/app.iml
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -47,42 +46,37 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/Hubble" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/LazierTracker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -142,5 +136,7 @@
     <orderEntry type="library" exported="" name="support-vector-drawable-25.1.0" level="project" />
     <orderEntry type="library" exported="" name="butterknife-8.5.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-25.1.0" level="project" />
+    <orderEntry type="module" module-name="tracker" exported="" />
+    <orderEntry type="library" exported="" name="fastjson-1.2.8" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
     defaultConfig {
-        applicationId "com.codelessda.demo"
+        applicationId "com.codeless.demo"
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
@@ -34,13 +34,14 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-compat'
     }
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile project(':tracker')
 }
 
 // 直接引用buildsrc的插件类
-//apply plugin: com.codelessda.plugin.InjectPluginImpl
+//apply plugin: com.codeless.plugin.InjectPluginImpl
 // 引用远程maven仓库的插件
-apply plugin: 'com.codelessda'
-codelessdaConfig {
+apply plugin: 'com.codeless'
+codelessConfig {
     //this will determine the name of this plugin transform, no practical use.
     pluginName = 'myPluginTest'
     //turn this on to make it print help content, default value is true

diff --git a/...emo/dabeaver/ExampleInstrumentedTest.java → ...emo/dabeaver/ExampleInstrumentedTest.java b/...emo/dabeaver/ExampleInstrumentedTest.java → ...emo/dabeaver/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.codelessda.demo.dabeaver;
+package com.codeless.demo.dabeaver;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.codelessda.demo">
+          package="com.codeless.demo">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name="com.codeless.demo.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 

diff --git a/...ava/com/codelessda/demo/MainActivity.java → .../java/com/codeless/demo/MainActivity.java b/...ava/com/codelessda/demo/MainActivity.java → .../java/com/codeless/demo/MainActivity.java
@@ -1,4 +1,4 @@
-package com.codelessda.demo;
+package com.codeless.demo;
 
 import android.content.DialogInterface;
 import android.support.v7.app.AppCompatActivity;
@@ -11,6 +11,8 @@
 import android.widget.RatingBar;
 import android.widget.SeekBar;
 
+import com.codeless.tracker.Tracker;
+
 public class MainActivity extends AppCompatActivity implements
         View.OnClickListener
         , DialogInterface.OnClickListener
@@ -24,10 +26,15 @@ public class MainActivity extends AppCompatActivity implements
         , ExpandableListView.OnChildClickListener
 {
 
+    private String mTestField = "我是测试变量";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        Tracker.init(this.getApplicationContext());
+
         this.findViewById(R.id.btn).setOnClickListener(this);
     }
 

diff --git a/...odelessda/demo/fragment/BaseFragment.java → .../codeless/demo/fragment/BaseFragment.java b/...odelessda/demo/fragment/BaseFragment.java → .../codeless/demo/fragment/BaseFragment.java
@@ -1,4 +1,4 @@
-package com.codelessda.demo.fragment;
+package com.codeless.demo.fragment;
 
 /**
  * Created by zhangdan on 17/3/3.

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity">
+    tools:context="com.codeless.demo.MainActivity">
 
     <Button
         android:id="@+id/btn"

diff --git a/.../com/codelessda/demo/ExampleUnitTest.java → ...va/com/codeless/demo/ExampleUnitTest.java b/.../com/codelessda/demo/ExampleUnitTest.java → ...va/com/codeless/demo/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.codelessda.demo;
+package com.codeless.demo;
 
 import org.junit.Test;
 

diff --git a/buildsrc/build.gradle b/buildsrc/build.gradle
@@ -1,10 +1,8 @@
 apply plugin: 'groovy'
 
 dependencies {
-    compile gradleApi()
-    compile localGroovy()
     compile 'com.android.tools.build:gradle:2.2.2'
-    compile "commons-io:commons-io:1.4"
+    compile 'commons-io:commons-io:1.4'
     compile 'org.ow2.asm:asm:5.0'
 }
 repositories {
@@ -19,8 +17,8 @@ uploadArchives{
         def deployPath = file('/Users/zhangdan/Desktop/Gradle_Plugin_Repo')
         repository(url:"file://${deployPath.absolutePath}")
         pom.project{
-            groupId "com.codelessda"
-            artifactId "codelessda-gradle-plugin"
+            groupId "com.codeless"
+            artifactId "codeless-gradle-plugin"
             version "0.0.1"
         }
     }

diff --git a/buildsrc/buildsrc.iml b/buildsrc/buildsrc.iml
@@ -18,8 +18,8 @@
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/groovy" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/groovy" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/groovy" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
@@ -42,6 +42,7 @@
     <orderEntry type="library" exported="" name="org.jacoco.report-0.7.5.201505241946" level="project" />
     <orderEntry type="library" exported="" name="jopt-simple-4.9" level="project" />
     <orderEntry type="library" exported="" name="protobuf-java-2.5.0" level="project" />
+    <orderEntry type="library" exported="" name="antlr-3.5.2" level="project" />
     <orderEntry type="library" exported="" name="builder-model-2.2.2" level="project" />
     <orderEntry type="library" exported="" name="builder-test-api-2.2.2" level="project" />
     <orderEntry type="library" exported="" name="sdklib-25.2.2" level="project" />
@@ -65,6 +66,8 @@
     <orderEntry type="library" exported="" name="juniversalchardet-1.0.3" level="project" />
     <orderEntry type="library" exported="" name="proguard-base-5.2.1" level="project" />
     <orderEntry type="library" exported="" name="asm-debug-all-5.0.1" level="project" />
+    <orderEntry type="library" exported="" name="antlr-runtime-3.5.2" level="project" />
+    <orderEntry type="library" exported="" name="ST4-4.0.8" level="project" />
     <orderEntry type="library" exported="" name="layoutlib-api-25.2.2" level="project" />
     <orderEntry type="library" exported="" name="dvlib-25.2.2" level="project" />
     <orderEntry type="library" exported="" name="repository-25.2.2" level="project" />
@@ -86,8 +89,5 @@
     <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
     <orderEntry type="library" exported="" name="annotations-25.2.2" level="project" />
     <orderEntry type="library" exported="" name="guava-18.0" level="project" />
-    <orderEntry type="library" exported="" name="gradle-api-2.14.1" level="project" />
-    <orderEntry type="library" exported="" name="groovy-all-2.4.4" level="project" />
-    <orderEntry type="library" exported="" name="gradle-installation-beacon-2.14.1" level="project" />
   </component>
 </module>
diff --git a/...codelessda/plugin/InjectPluginImpl.groovy → ...m/codeless/plugin/InjectPluginImpl.groovy b/...codelessda/plugin/InjectPluginImpl.groovy → ...m/codeless/plugin/InjectPluginImpl.groovy
@@ -1,27 +1,25 @@
-package com.codelessda.plugin
+package com.codeless.plugin
 
 import com.android.build.gradle.BaseExtension
-import com.codelessda.plugin.utils.DataHelper
-import com.codelessda.plugin.utils.Log
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
 class InjectPluginImpl implements Plugin<Project> {
     @Override
     void apply(Project project) {
-        println ":applied Hubble"
-        project.extensions.create('codelessdaConfig', InjectPluginParams)
+        println ":applied LazierTracker"
+        project.extensions.create('codelessConfig', InjectPluginParams)
         registerTransform(project)
         initDir(project);
         project.afterEvaluate {
-            Log.setQuiet(project.codelessdaConfig.keepQuiet);
-            Log.setShowHelp(project.codelessdaConfig.showHelp);
-            Log.logHelp();
-            if (project.codelessdaConfig.watchTimeConsume) {
-                Log.info "watchTimeConsume enabled"
+            com.codeless.plugin.utils.Log.setQuiet(project.codelessConfig.keepQuiet);
+            com.codeless.plugin.utils.Log.setShowHelp(project.codelessConfig.showHelp);
+            com.codeless.plugin.utils.Log.logHelp();
+            if (project.codelessConfig.watchTimeConsume) {
+                com.codeless.plugin.utils.Log.info "watchTimeConsume enabled"
                 project.gradle.addListener(new TimeListener())
             } else {
-                Log.info "watchTimeConsume disabled"
+                com.codeless.plugin.utils.Log.info "watchTimeConsume disabled"
             }
         }
     }
@@ -34,10 +32,10 @@ class InjectPluginImpl implements Plugin<Project> {
     }
 
     static void initDir(Project project) {
-        File pluginTmpDir = new File(project.buildDir, 'Hubble')
+        File pluginTmpDir = new File(project.buildDir, 'LazierTracker')
         if (!pluginTmpDir.exists()) {
             pluginTmpDir.mkdir()
         }
-        DataHelper.ext.pluginTmpDir = pluginTmpDir
+        com.codeless.plugin.utils.DataHelper.ext.pluginTmpDir = pluginTmpDir
     }
 }
diff --git a/...delessda/plugin/InjectPluginParams.groovy → ...codeless/plugin/InjectPluginParams.groovy b/...delessda/plugin/InjectPluginParams.groovy → ...codeless/plugin/InjectPluginParams.groovy
@@ -1,4 +1,4 @@
-package com.codelessda.plugin
+package com.codeless.plugin
 
 public class InjectPluginParams {
     String pluginName = ''