release: SDK 1.18.2

BatchLabs · Feb 23, 2022 · dddf764 · dddf764
1 parent 677c71d
commit dddf764
Show file tree

Hide file tree

Showing 530 changed files with 70,272 additions and 68,624 deletions.
diff --git a/Sources/.gitignore b/Sources/.gitignore
@@ -25,4 +25,6 @@
 **/*.iml
 **/.idea/saveactions_settings.xml
 **/.idea/assetWizardSettings.xml
-**/.idea/jarRepositories.xml
+**/.idea/jarRepositories.xml
+
+**/.idea/compiler.xml
diff --git a/Sources/.idea/compiler.xml b/Sources/.idea/compiler.xml
diff --git a/Sources/sdk-stubs/src/main/java/sun/misc/Unsafe.java b/Sources/sdk-stubs/src/main/java/sun/misc/Unsafe.java
@@ -34,151 +34,139 @@
  */
 public class Unsafe {
 
-  public Object allocateInstance(Class<?> clazz) throws InstantiationException {
-    /* null implementation */return null;
-  }
-
-  public int arrayIndexScale(Class arrayClass) {
-    /* null implementation */return 0;
-  }
-
-  public int arrayBaseOffset(Class arrayClass) {
-    /* null implementation */return 0;
-  }
-
-  public void copyMemory(long srcAddress, long targetAddress, long length) {
-    /* null implementation */
-  }
-
-  public void copyMemory(
-    byte[] src,
-    long srcIndex,
-    byte[] target,
-    long targetIndex,
-    long length
-  ) {
-    /* null implementation */
-  }
-
-  public void copyMemory(
-    Object srcBase,
-    long srcOffset,
-    Object destBase,
-    long destOffset,
-    long bytes
-  ) {
-    /* null implementation */
-  }
-
-  public boolean getBoolean(Object o, long offset) {
-    /* null implementation */return false;
-  }
-
-  public boolean getBoolean(long address) {
-    /* null implementation */return false;
-  }
-
-  public byte getByte(Object o, long offset) {
-    /* null implementation */return 0;
-  }
-
-  public byte getByte(long address) {
-    /* null implementation */return 0;
-  }
-
-  public float getFloat(Object o, long offset) {
-    /* null implementation */return 0;
-  }
-
-  public double getDouble(Object o, long offset) {
-    /* null implementation */return 0;
-  }
-
-  public short getShort(Object o, long offset) {
-    /* null implementation */return 0;
-  }
-
-  public int getInt(Object o, long offset) {
-    /* null implementation */return 0;
-  }
-
-  public int getInt(long address) {
-    /* null implementation */return 0;
-  }
-
-  public long getLong(Object o, long offset) {
-    /* null implementation */return 0;
-  }
-
-  public long getLong(long address) {
-    /* null implementation */return 0;
-  }
-
-  public Object getObject(Object o, long offset) {
-    /* null implementation */return null;
-  }
-
-  public long objectFieldOffset(java.lang.reflect.Field f) {
-    /* null implementation */return 0;
-  }
-
-  public void putBoolean(Object o, long offset, boolean x) {
-    /* null implementation */
-  }
-
-  public void putBoolean(long address, boolean x) {
-    /* null implementation */
-  }
-
-  public void putByte(Object o, long offset, byte x) {
-    /* null implementation */
-  }
-
-  public void putByte(long address, byte x) {
-    /* null implementation */
-  }
-
-  public void putFloat(Object o, long offset, float x) {
-    /* null implementation */
-  }
-
-  public void putDouble(Object o, long offset, double x) {
-    /* null implementation */
-  }
-
-  public void putShort(Object o, long offset, short x) {
-    /* null implementation */
-  }
-
-  public void putInt(Object o, long offset, int x) {
-    /* null implementation */
-  }
-
-  public void putInt(long address, int x) {
-    /* null implementation */
-  }
-
-  public void putLong(Object o, long offset, long x) {
-    /* null implementation */
-  }
-
-  public void putLong(long address, long x) {
-    /* null implementation */
-  }
-
-  public void putObject(Object o, long offset, Object x) {
-    /* null implementation */
-  }
+    public Object allocateInstance(Class<?> clazz) throws InstantiationException {
+        /* null implementation */return null;
+    }
 
-  public Object staticFieldBase(java.lang.reflect.Field f) {
-    /* null implementation */return null;
-  }
+    public int arrayIndexScale(Class arrayClass) {
+        /* null implementation */return 0;
+    }
 
-  public long staticFieldOffset(java.lang.reflect.Field f) {
-    /* null implementation */return 0;
-  }
+    public int arrayBaseOffset(Class arrayClass) {
+        /* null implementation */return 0;
+    }
 
-  public void freeMemory(long address) {
-    /* null implementation */
-  }
+    public void copyMemory(long srcAddress, long targetAddress, long length) {
+        /* null implementation */
+    }
+
+    public void copyMemory(byte[] src, long srcIndex, byte[] target, long targetIndex, long length) {
+        /* null implementation */
+    }
+
+    public void copyMemory(Object srcBase, long srcOffset, Object destBase, long destOffset, long bytes) {
+        /* null implementation */
+    }
+
+    public boolean getBoolean(Object o, long offset) {
+        /* null implementation */return false;
+    }
+
+    public boolean getBoolean(long address) {
+        /* null implementation */return false;
+    }
+
+    public byte getByte(Object o, long offset) {
+        /* null implementation */return 0;
+    }
+
+    public byte getByte(long address) {
+        /* null implementation */return 0;
+    }
+
+    public float getFloat(Object o, long offset) {
+        /* null implementation */return 0;
+    }
+
+    public double getDouble(Object o, long offset) {
+        /* null implementation */return 0;
+    }
+
+    public short getShort(Object o, long offset) {
+        /* null implementation */return 0;
+    }
+
+    public int getInt(Object o, long offset) {
+        /* null implementation */return 0;
+    }
+
+    public int getInt(long address) {
+        /* null implementation */return 0;
+    }
+
+    public long getLong(Object o, long offset) {
+        /* null implementation */return 0;
+    }
+
+    public long getLong(long address) {
+        /* null implementation */return 0;
+    }
+
+    public Object getObject(Object o, long offset) {
+        /* null implementation */return null;
+    }
+
+    public long objectFieldOffset(java.lang.reflect.Field f) {
+        /* null implementation */return 0;
+    }
+
+    public void putBoolean(Object o, long offset, boolean x) {
+        /* null implementation */
+    }
+
+    public void putBoolean(long address, boolean x) {
+        /* null implementation */
+    }
+
+    public void putByte(Object o, long offset, byte x) {
+        /* null implementation */
+    }
+
+    public void putByte(long address, byte x) {
+        /* null implementation */
+    }
+
+    public void putFloat(Object o, long offset, float x) {
+        /* null implementation */
+    }
+
+    public void putDouble(Object o, long offset, double x) {
+        /* null implementation */
+    }
+
+    public void putShort(Object o, long offset, short x) {
+        /* null implementation */
+    }
+
+    public void putInt(Object o, long offset, int x) {
+        /* null implementation */
+    }
+
+    public void putInt(long address, int x) {
+        /* null implementation */
+    }
+
+    public void putLong(Object o, long offset, long x) {
+        /* null implementation */
+    }
+
+    public void putLong(long address, long x) {
+        /* null implementation */
+    }
+
+    public void putObject(Object o, long offset, Object x) {
+        /* null implementation */
+    }
+
+    public Object staticFieldBase(java.lang.reflect.Field f) {
+        /* null implementation */return null;
+    }
+
+    public long staticFieldOffset(java.lang.reflect.Field f) {
+        /* null implementation */return 0;
+    }
+
+    public void freeMemory(long address) {
+        /* null implementation */
+    }
 }
diff --git a/Sources/sdk/build.gradle b/Sources/sdk/build.gradle
@@ -26,7 +26,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 31
         versionCode 1
-        versionName "1.18.1"
+        versionName "1.18.2"
         buildConfigField "String", SDK_VERSION, "\"$versionName\""
         buildConfigField "Integer", API_LEVEL, '40'
         buildConfigField "Integer", MESSAGING_API_LEVEL, '11'
@@ -140,7 +140,7 @@ dependencies {
     testImplementation "com.google.android.gms:play-services-location:$playServicesVersion"
     testImplementation "com.google.android.gms:play-services-nearby:$playServicesVersion"
     testImplementation "androidx.appcompat:appcompat:$androidXLibraryVersion"
-    testImplementation 'org.robolectric:robolectric:4.5.1'
+    testImplementation 'org.robolectric:robolectric:4.7.1'
 
     testImplementation "org.powermock:powermock-module-junit4:2.0.7"
     testImplementation "org.powermock:powermock-module-junit4-rule:2.0.7"

diff --git a/Sources/sdk/proguard-sdk-release.txt b/Sources/sdk/proguard-sdk-release.txt
@@ -4,6 +4,9 @@
 -dontwarn javax.annotation.**
 -dontusemixedcaseclassnames
 
+# Removing this will have R8 repackage classes at root "a"/"b"/etc packages, potentially causing
+# conflicts. An alternative would be "-keeppackagenames" but it makes an heavier AAR
+-flattenpackagehierarchy 'com.batch.android'
 -keepparameternames
 -renamesourcefileattribute SourceFile
 -keepattributes Exceptions,InnerClasses,Signature,Deprecated,

diff --git a/Sources/sdk/src/androidTest/java/com/batch/android/AdvertisingIDTest.java b/Sources/sdk/src/androidTest/java/com/batch/android/AdvertisingIDTest.java
@@ -20,18 +20,18 @@
 @SmallTest
 public class AdvertisingIDTest {
 
-  /**
-   * Test advertising ID value
-   *
-   * @throws Exception
-   */
-  @Test
-  public void testAdvertisingID() throws Exception {
-    AdvertisingID device = AdvertisingIDProvider.get();
+    /**
+     * Test advertising ID value
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testAdvertisingID() throws Exception {
+        AdvertisingID device = AdvertisingIDProvider.get();
 
-    Thread.sleep(2000);
+        Thread.sleep(2000);
 
-    assertTrue(device.isReady());
-    assertNotNull(device.get());
-  }
+        assertTrue(device.isReady());
+        assertNotNull(device.get());
+    }
 }
diff --git a/Sources/sdk/src/androidTest/java/com/batch/android/TestApplication.java b/Sources/sdk/src/androidTest/java/com/batch/android/TestApplication.java
@@ -5,10 +5,10 @@
 
 public class TestApplication extends Application {
 
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    FirebaseApp.initializeApp(this);
-    Batch.setConfig(new com.batch.android.Config("FAKE_API_KEY"));
-  }
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        FirebaseApp.initializeApp(this);
+        Batch.setConfig(new com.batch.android.Config("FAKE_API_KEY"));
+    }
 }