Merge pull request linkedin#19 from ened/new-package

rename the package to com.android.dx instead of using jarjar
udcool · Jul 23, 2015 · d71e384 · d71e384
2 parents d1ca08b + 08b254c
commit d71e384
Show file tree

Hide file tree

Showing 26 changed files with 57 additions and 78 deletions.
diff --git a/dexmaker/pom.xml b/dexmaker/pom.xml
@@ -47,30 +47,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>jarjar-maven-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jarjar</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>com.google.dexmaker:dexmaker-dx</include>
-                            </includes>
-                            <rules>
-                                <rule>
-                                    <pattern>com.android.dx.**</pattern>
-                                    <result>com.google.dexmaker.dx.@1</result>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/...om/google/dexmaker/AppDataDirGuesser.java → ...ava/com/android/dx/AppDataDirGuesser.java b/...om/google/dexmaker/AppDataDirGuesser.java → ...ava/com/android/dx/AppDataDirGuesser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import java.io.File;
 import java.lang.reflect.Field;

diff --git a/...in/java/com/google/dexmaker/BinaryOp.java → ...rc/main/java/com/android/dx/BinaryOp.java b/...in/java/com/google/dexmaker/BinaryOp.java → ...rc/main/java/com/android/dx/BinaryOp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.code.Rop;
 import com.android.dx.rop.code.Rops;

diff --git a/...c/main/java/com/google/dexmaker/Code.java → ...er/src/main/java/com/android/dx/Code.java b/...c/main/java/com/google/dexmaker/Code.java → ...er/src/main/java/com/android/dx/Code.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.code.BasicBlockList;
 import com.android.dx.rop.code.Insn;

diff --git a/.../java/com/google/dexmaker/Comparison.java → .../main/java/com/android/dx/Comparison.java b/.../java/com/google/dexmaker/Comparison.java → .../main/java/com/android/dx/Comparison.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.code.Rop;
 import com.android.dx.rop.code.Rops;

diff --git a/...n/java/com/google/dexmaker/Constants.java → ...c/main/java/com/android/dx/Constants.java b/...n/java/com/google/dexmaker/Constants.java → ...c/main/java/com/android/dx/Constants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.cst.CstBoolean;
 import com.android.dx.rop.cst.CstByte;

diff --git a/...in/java/com/google/dexmaker/DexMaker.java → ...rc/main/java/com/android/dx/DexMaker.java b/...in/java/com/google/dexmaker/DexMaker.java → ...rc/main/java/com/android/dx/DexMaker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.dex.DexFormat;
 import com.android.dx.dex.DexOptions;

diff --git a/...ain/java/com/google/dexmaker/FieldId.java → ...src/main/java/com/android/dx/FieldId.java b/...ain/java/com/google/dexmaker/FieldId.java → ...src/main/java/com/android/dx/FieldId.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.cst.CstFieldRef;
 import com.android.dx.rop.cst.CstNat;

diff --git a/.../main/java/com/google/dexmaker/Label.java → ...r/src/main/java/com/android/dx/Label.java b/.../main/java/com/google/dexmaker/Label.java → ...r/src/main/java/com/android/dx/Label.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.code.BasicBlock;
 import com.android.dx.rop.code.Insn;

diff --git a/.../main/java/com/google/dexmaker/Local.java → ...r/src/main/java/com/android/dx/Local.java b/.../main/java/com/google/dexmaker/Local.java → ...r/src/main/java/com/android/dx/Local.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.code.RegisterSpec;
 

diff --git a/...in/java/com/google/dexmaker/MethodId.java → ...rc/main/java/com/android/dx/MethodId.java b/...in/java/com/google/dexmaker/MethodId.java → ...rc/main/java/com/android/dx/MethodId.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.cst.CstMethodRef;
 import com.android.dx.rop.cst.CstNat;

diff --git a/...main/java/com/google/dexmaker/TypeId.java → .../src/main/java/com/android/dx/TypeId.java b/...main/java/com/google/dexmaker/TypeId.java → .../src/main/java/com/android/dx/TypeId.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.cst.CstType;
 import java.util.HashMap;

diff --git a/...in/java/com/google/dexmaker/TypeList.java → ...rc/main/java/com/android/dx/TypeList.java b/...in/java/com/google/dexmaker/TypeList.java → ...rc/main/java/com/android/dx/TypeList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.type.StdTypeList;
 import java.util.Arrays;

diff --git a/...ain/java/com/google/dexmaker/UnaryOp.java → ...src/main/java/com/android/dx/UnaryOp.java b/...ain/java/com/google/dexmaker/UnaryOp.java → ...src/main/java/com/android/dx/UnaryOp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import com.android.dx.rop.code.Rop;
 import com.android.dx.rop.code.Rops;

diff --git a/...m/google/dexmaker/stock/ProxyBuilder.java → ...va/com/android/dx/stock/ProxyBuilder.java b/...m/google/dexmaker/stock/ProxyBuilder.java → ...va/com/android/dx/stock/ProxyBuilder.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker.stock;
-
-import com.google.dexmaker.Code;
-import com.google.dexmaker.Comparison;
-import com.google.dexmaker.DexMaker;
-import com.google.dexmaker.FieldId;
-import com.google.dexmaker.Label;
-import com.google.dexmaker.Local;
-import com.google.dexmaker.MethodId;
-import com.google.dexmaker.TypeId;
+package com.android.dx.stock;
+
+import com.android.dx.Code;
+import com.android.dx.FieldId;
+import com.android.dx.Comparison;
+import com.android.dx.DexMaker;
+import com.android.dx.Label;
+import com.android.dx.Local;
+import com.android.dx.MethodId;
+import com.android.dx.TypeId;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Constructor;

diff --git a/...oogle/dexmaker/AppDataDirGuesserTest.java → ...com/android/dx/AppDataDirGuesserTest.java b/...oogle/dexmaker/AppDataDirGuesserTest.java → ...com/android/dx/AppDataDirGuesserTest.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.File;
-import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;

diff --git a/...ava/com/google/dexmaker/DexMakerTest.java → ...est/java/com/android/dx/DexMakerTest.java b/...ava/com/google/dexmaker/DexMakerTest.java → ...est/java/com/android/dx/DexMakerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import java.io.File;
 import java.io.FilenameFilter;

diff --git a/.../java/com/google/dexmaker/TypeIdTest.java → .../test/java/com/android/dx/TypeIdTest.java b/.../java/com/google/dexmaker/TypeIdTest.java → .../test/java/com/android/dx/TypeIdTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker;
+package com.android.dx;
 
 import junit.framework.TestCase;
 

diff --git a/...gle/dexmaker/examples/FibonacciMaker.java → ...m/android/dx/examples/FibonacciMaker.java b/...gle/dexmaker/examples/FibonacciMaker.java → ...m/android/dx/examples/FibonacciMaker.java
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker.examples;
+package com.android.dx.examples;
+
+import com.android.dx.Code;
+import com.android.dx.Comparison;
+import com.android.dx.DexMaker;
+import com.android.dx.Label;
+import com.android.dx.Local;
+import com.android.dx.MethodId;
+import com.android.dx.TypeId;
+import com.android.dx.BinaryOp;
 
-import com.google.dexmaker.BinaryOp;
-import com.google.dexmaker.Code;
-import com.google.dexmaker.Comparison;
-import com.google.dexmaker.DexMaker;
-import com.google.dexmaker.Label;
-import com.google.dexmaker.Local;
-import com.google.dexmaker.MethodId;
-import com.google.dexmaker.TypeId;
 import java.io.File;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

diff --git a/...le/dexmaker/examples/HelloWorldMaker.java → .../android/dx/examples/HelloWorldMaker.java b/...le/dexmaker/examples/HelloWorldMaker.java → .../android/dx/examples/HelloWorldMaker.java
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker.examples;
-
-import com.google.dexmaker.BinaryOp;
-import com.google.dexmaker.Code;
-import com.google.dexmaker.DexMaker;
-import com.google.dexmaker.FieldId;
-import com.google.dexmaker.Local;
-import com.google.dexmaker.MethodId;
-import com.google.dexmaker.TypeId;
+package com.android.dx.examples;
+
+import com.android.dx.Code;
+import com.android.dx.FieldId;
+import com.android.dx.Local;
+import com.android.dx.TypeId;
+import com.android.dx.BinaryOp;
+import com.android.dx.DexMaker;
+import com.android.dx.MethodId;
+
 import java.io.File;
 import java.io.PrintStream;
 import java.lang.reflect.Modifier;

diff --git a/...ogle/dexmaker/stock/ProxyBuilderTest.java → ...om/android/dx/stock/ProxyBuilderTest.java b/...ogle/dexmaker/stock/ProxyBuilderTest.java → ...om/android/dx/stock/ProxyBuilderTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker.stock;
+package com.android.dx.stock;
+
+import com.android.dx.DexMakerTest;
 
-import com.google.dexmaker.DexMakerTest;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;

diff --git a/...e/dexmaker/mockito/DexmakerMockMaker.java → ...android/dx/mockito/DexmakerMockMaker.java b/...e/dexmaker/mockito/DexmakerMockMaker.java → ...android/dx/mockito/DexmakerMockMaker.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker.mockito;
+package com.android.dx.mockito;
+
+import com.android.dx.stock.ProxyBuilder;
 
-import com.google.dexmaker.stock.ProxyBuilder;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.util.Set;

diff --git a/...ker/mockito/InvocationHandlerAdapter.java → .../dx/mockito/InvocationHandlerAdapter.java b/...ker/mockito/InvocationHandlerAdapter.java → .../dx/mockito/InvocationHandlerAdapter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker.mockito;
+package com.android.dx.mockito;
 
-import com.google.dexmaker.stock.ProxyBuilder;
+import com.android.dx.stock.ProxyBuilder;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

diff --git a/...gle/dexmaker/mockito/UnsafeAllocator.java → ...m/android/dx/mockito/UnsafeAllocator.java b/...gle/dexmaker/mockito/UnsafeAllocator.java → ...m/android/dx/mockito/UnsafeAllocator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.dexmaker.mockito;
+package com.android.dx.mockito;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;

diff --git a/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -1 +1 @@
-com.google.dexmaker.mockito.DexmakerMockMaker
+com.android.dx.mockito.DexmakerMockMaker
diff --git a/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider
@@ -1 +1 @@
-com.google.dexmaker.mockito.DexmakerMockMaker
+com.android.dx.mockito.DexmakerMockMaker
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		com.google.dexmaker.mockito.DexmakerMockMaker
		com.android.dx.mockito.DexmakerMockMaker