update name

xiaoqi · xiaoqi · commit 8eef7b1885c8 · 2017-12-09T14:53:48.000+08:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.novoda:bintray-release:0.5.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -33,11 +32,11 @@ task clean(type: Delete) {
 
 //添加
 ext {
-    userOrg = 'xqandroid'
-    groupId = 'com.xiaoqi'
-    uploadName = 'AutoSave'
-    publishVersion = '1.1.1'
-    desc = 'A framework can automatically generate OnSaveInstanceState code'
-    website = 'https://github.com/xiaoqiAndroid/AutoSave'
+    userOrg = 'noober'
+    groupId = 'com.noober.savehelper'
+    uploadName = 'AutoSaver'
+    publishVersion = '1.0.0'
+    desc = "A light weght framework can automatically generate 'OnSaveInstanceState' code"
+    website = 'https://github.com/JavaNoober/AutoSave'
 //    gradlew clean build bintrayUpload -PbintrayUser=xiaoqiandroid -PbintrayKey=xxxxxxxxxxxxxxxx -PdryRun=false
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-//apply plugin: 'android-apt'
 
 android {
     compileSdkVersion 26
@@ -34,9 +33,9 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:+'
-    testCompile 'junit:junit:4.12'
-    compile 'com.xiaoqi:xqauto-api:1.1.0'
-    annotationProcessor 'com.xiaoqi:xqauto-processor:1.1.0'
-    compile 'com.xiaoqi:xqauto-savehelper:1.1.0'
+    implementation 'com.android.support:appcompat-v7:+'
+    testImplementation 'junit:junit:4.12'
+    implementation project(':savehelper')
+    implementation project(':savehelper-api')
+    annotationProcessor project(':savehelper-processor')
 }
diff --git a/sample/src/main/java/com/xiaoqi/autosavesample/MainActivity.java b/sample/src/main/java/com/xiaoqi/autosavesample/MainActivity.java
@@ -3,8 +3,9 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
-import com.xqand.api.NeedSave;
-import com.xqand.savehelper.SaveHelper;
+
+import com.noober.api.NeedSave;
+import com.noober.savehelper.SaveHelper;
 
 import java.util.ArrayList;
 
diff --git a/sample/src/main/java/com/xiaoqi/autosavesample/MainFragment.java b/sample/src/main/java/com/xiaoqi/autosavesample/MainFragment.java
@@ -6,8 +6,9 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.xqand.api.NeedSave;
-import com.xqand.savehelper.SaveHelper;
+
+import com.noober.api.NeedSave;
+import com.noober.savehelper.SaveHelper;
 
 import java.util.ArrayList;
 
diff --git a/savehelper-api/.gitignore b/savehelper-api/.gitignore
diff --git a/savehelper-api/build.gradle b/savehelper-api/build.gradle
@@ -10,7 +10,7 @@ targetCompatibility = "1.7"
 
 //添加
 publish {
-    artifactId = 'xqauto-api'
+    artifactId = 'savehelper-api'
     userOrg = rootProject.userOrg
     groupId = rootProject.groupId
     uploadName = rootProject.uploadName
diff --git a/savehelper-api/src/main/java/com/noober/api/NeedSave.java b/savehelper-api/src/main/java/com/noober/api/NeedSave.java
@@ -1,4 +1,4 @@
-package com.xqand.api;
+package com.noober.api;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/savehelper-processor/.gitignore b/savehelper-processor/.gitignore
diff --git a/savehelper-processor/build.gradle b/savehelper-processor/build.gradle
@@ -3,18 +3,16 @@ apply plugin: 'bintray-release'
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-//    compile 'com.google.auto:auto-common:0.6'
-//    compile 'com.google.auto.service:auto-service:1.0-rc2'
     compile 'com.squareup:javapoet:1.8.0'
-    compile project(':xqauto-api')
+    compile project(':savehelper-api')
 }
 
 sourceCompatibility = "1.7"
 targetCompatibility = "1.7"
 
 //添加
 publish {
-    artifactId = 'xqauto-processor'
+    artifactId = 'processor'
     userOrg = rootProject.userOrg
     groupId = rootProject.groupId
     uploadName = rootProject.uploadName
diff --git a/savehelper-processor/src/main/java/com/noober/helper/HelperClass.java b/savehelper-processor/src/main/java/com/noober/helper/HelperClass.java
@@ -1,8 +1,8 @@
-package com.xqand.helper;
+package com.noober.helper;
 
+import com.noober.processor.HelperConfig;
+import com.noober.utils.TypeUtil;
 import com.squareup.javapoet.ParameterizedTypeName;
-import com.xqand.processor.HelperConfig;
-import com.xqand.utils.TypeUtil;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.MethodSpec;
diff --git a/savehelper-processor/src/main/java/com/noober/helper/HelperSavedValues.java b/savehelper-processor/src/main/java/com/noober/helper/HelperSavedValues.java
@@ -1,6 +1,6 @@
-package com.xqand.helper;
+package com.noober.helper;
 
-import com.xqand.api.NeedSave;
+import com.noober.api.NeedSave;
 
 import java.util.Set;
 
diff --git a/savehelper-processor/src/main/java/com/noober/processor/AutoSaveProcessor.java b/savehelper-processor/src/main/java/com/noober/processor/AutoSaveProcessor.java
@@ -1,9 +1,10 @@
-package com.xqand.processor;
+package com.noober.processor;
 
 
-import com.xqand.helper.HelperClass;
-import com.xqand.helper.HelperSavedValues;
-import com.xqand.api.NeedSave;
+import com.noober.api.NeedSave;
+import com.noober.helper.HelperClass;
+import com.noober.helper.HelperSavedValues;
+import com.squareup.javapoet.JavaFile;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -62,8 +63,9 @@ public boolean process(Set<? extends TypeElement> set, RoundEnvironment roundEnv
 		}
 		for(HelperClass helperClass : mHelperClassMap.values()){
 			try {
-				if(helperClass.generateCode() != null){
-					helperClass.generateCode().writeTo(filer);
+				JavaFile javaFile = helperClass.generateCode();
+				if(javaFile != null){
+					javaFile.writeTo(filer);
 				}
 			} catch (IOException e) {
 				e.printStackTrace();
diff --git a/savehelper-processor/src/main/java/com/noober/processor/HelperConfig.java b/savehelper-processor/src/main/java/com/noober/processor/HelperConfig.java
@@ -1,4 +1,4 @@
-package com.xqand.processor;
+package com.noober.processor;
 
 /**
  * Created by xiaoqi on 2017/1/10.
diff --git a/savehelper-processor/src/main/java/com/noober/utils/TypeUtil.java b/savehelper-processor/src/main/java/com/noober/utils/TypeUtil.java
@@ -1,8 +1,8 @@
-package com.xqand.utils;
+package com.noober.utils;
 
 import com.squareup.javapoet.ClassName;
 
 public class TypeUtil {
     public static final ClassName BUNDLE = ClassName.get("android.os", "Bundle");
-    public static final ClassName IHELPER = ClassName.get("com.xqand.savehelper", "ISaveInstanceStateHelper");
+    public static final ClassName IHELPER = ClassName.get("com.noober.savehelper", "ISaveInstanceStateHelper");
 }
diff --git a/savehelper-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/savehelper-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1 @@
+com.noober.processor.AutoSaveProcessor
diff --git a/savehelper/.gitignore b/savehelper/.gitignore
diff --git a/savehelper/build.gradle b/savehelper/build.gradle
@@ -27,17 +27,17 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     provided 'com.android.support:appcompat-v7:+'
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
 
 //添加
 publish {
-    artifactId = 'xqauto-savehelper'
+    artifactId = 'savehelper'
     userOrg = rootProject.userOrg
     groupId = rootProject.groupId
     uploadName = rootProject.uploadName
diff --git a/savehelper/proguard-rules.pro b/savehelper/proguard-rules.pro
diff --git a/savehelper/src/androidTest/java/com/noober/savehelper/ExampleInstrumentedTest.java b/savehelper/src/androidTest/java/com/noober/savehelper/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.xqand.savehelper;
+package com.noober.savehelper;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
diff --git a/savehelper/src/main/AndroidManifest.xml b/savehelper/src/main/AndroidManifest.xml
diff --git a/savehelper/src/main/java/com/noober/savehelper/ISaveInstanceStateHelper.java b/savehelper/src/main/java/com/noober/savehelper/ISaveInstanceStateHelper.java
@@ -1,7 +1,6 @@
-package com.xqand.savehelper;
+package com.noober.savehelper;
 
 
-import android.app.Activity;
 import android.os.Bundle;
 
 public interface ISaveInstanceStateHelper<T> {
diff --git a/savehelper/src/main/java/com/noober/savehelper/SaveHelper.java b/savehelper/src/main/java/com/noober/savehelper/SaveHelper.java
@@ -1,11 +1,8 @@
-package com.xqand.savehelper;
+package com.noober.savehelper;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/savehelper/src/main/res/values/strings.xml b/savehelper/src/main/res/values/strings.xml
diff --git a/savehelper/src/test/java/com/noober/savehelper/ExampleUnitTest.java b/savehelper/src/test/java/com/noober/savehelper/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.xqand.savehelper;
+package com.noober.savehelper;
 
 import org.junit.Test;
 
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':xqauto-api', ':xqauto-processor', ':xqauto-savehelper', ':sample'
+include ':savehelper-api', ':savehelper-processor', ':savehelper', ':sample'
diff --git a/xqauto-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/xqauto-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.xqand.api;`
	`1`	`+package com.noober.api;`
`2`	`2`
`3`	`3`	`import java.lang.annotation.ElementType;`
`4`	`4`	`import java.lang.annotation.Retention;`