Release V1.0.2

* this fixes #15 * updated Android Annotations to V4.4.0 * updated com.helger.jcodemodel to V3.0.1
tmtron · Nov 10, 2017 · 891ba71 · 891ba71
1 parent 6da128a
commit 891ba71
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 102 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml
diff --git a/README.md b/README.md
@@ -15,11 +15,13 @@ In the `build.gradle` file of the module project:
 ```gradle
     dependencies {
         // Android Annotations for Greenrobot
-        apt 'com.tmtron:green-annotations:1.0.1'
-        compile 'com.tmtron:green-annotations-api:1.0.1'
+        apt 'com.tmtron:green-annotations:1.0.2'
+        compile 'com.tmtron:green-annotations-api:1.0.2'
     }
 ```
 
+Note: Green-Annotations version `1.0.2` requires Android-Annotations version `4.4.0` 
+
 ## Details
 
 ### Before

diff --git a/green-annotations-api/green-annotations-api.iml b/green-annotations-api/green-annotations-api.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

diff --git a/green-annotations-api/pom.xml b/green-annotations-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.tmtron</groupId>
         <artifactId>green-annotations-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>green-annotations-api</artifactId>

diff --git a/green-annotations-parent.iml b/green-annotations-parent.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

diff --git a/green-annotations-test/green-annotations-test.iml b/green-annotations-test/green-annotations-test.iml
@@ -10,6 +10,7 @@
         <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/target/generated-sources/combined-resources/res" />
         <option name="APK_PATH" value="/target/green-annotations-test.apk" />
         <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
+        <option name="PACK_TEST_CODE" value="true" />
         <option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
         <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
         <resOverlayFolders>
@@ -22,45 +23,27 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target/AndroidManifest.xml" />
-      <excludeFolder url="file://$MODULE_DIR$/target/R.txt" />
-      <excludeFolder url="file://$MODULE_DIR$/target/apidocs" />
-      <excludeFolder url="file://$MODULE_DIR$/target/classes.dex" />
-      <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/aidl" />
-      <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/androidannotations.log" />
-      <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
-      <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/target/green-annotations-test-1.0.0-SNAPSHOT.ap_" />
-      <excludeFolder url="file://$MODULE_DIR$/target/green-annotations-test-1.0.0-SNAPSHOT.apk" />
-      <excludeFolder url="file://$MODULE_DIR$/target/green-annotations-test-1.0.0-SNAPSHOT.jar" />
-      <excludeFolder url="file://$MODULE_DIR$/target/green-annotations-test.apk" />
-      <excludeFolder url="file://$MODULE_DIR$/target/green-annotations-test.unaligned.apk" />
-      <excludeFolder url="file://$MODULE_DIR$/target/javadoc-bundle-options" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
-      <excludeFolder url="file://$MODULE_DIR$/target/site" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Maven Android API 25 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="green-annotations" scope="PROVIDED" />
-    <orderEntry type="library" name="Maven: com.helger:jcodemodel:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.helger:jcodemodel:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:annotations:3.0.1u2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
     <orderEntry type="module" module-name="green-annotations-api" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.androidannotations:androidannotations:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.androidannotations:androidannotations-api:4.1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.androidannotations:androidannotations:4.4.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.androidannotations:androidannotations-api:4.4.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />

diff --git a/green-annotations-test/pom.xml b/green-annotations-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.tmtron</groupId>
         <artifactId>green-annotations-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>green-annotations-test</artifactId>

diff --git a/green-annotations/green-annotations.iml b/green-annotations/green-annotations.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -10,33 +10,21 @@
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target/apidocs" />
-      <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" />
-      <excludeFolder url="file://$MODULE_DIR$/target/generated-test" />
-      <excludeFolder url="file://$MODULE_DIR$/target/green-annotations-1.0.0-SNAPSHOT-javadoc.jar" />
-      <excludeFolder url="file://$MODULE_DIR$/target/green-annotations-1.0.0-SNAPSHOT-sources.jar" />
-      <excludeFolder url="file://$MODULE_DIR$/target/green-annotations-1.0.0-SNAPSHOT.jar" />
-      <excludeFolder url="file://$MODULE_DIR$/target/invoker" />
-      <excludeFolder url="file://$MODULE_DIR$/target/javadoc-bundle-options" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
-      <excludeFolder url="file://$MODULE_DIR$/target/site" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="green-annotations-api" />
-    <orderEntry type="library" name="Maven: org.androidannotations:androidannotations:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.androidannotations:androidannotations-api:4.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.androidannotations:androidannotations-testutils:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.androidannotations:androidannotations:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.androidannotations:androidannotations-api:4.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.androidannotations:androidannotations-testutils:4.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.greenrobot:eventbus:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.helger:jcodemodel:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.helger:jcodemodel:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1u2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:2.3.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />

diff --git a/green-annotations/pom.xml b/green-annotations/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.tmtron</groupId>
         <artifactId>green-annotations-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>green-annotations</artifactId>