Skip to content

Commit dddf764

Browse files
committed
release: SDK 1.18.2
1 parent 677c71d commit dddf764

File tree

530 files changed

+70272
-68624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

530 files changed

+70272
-68624
lines changed

Sources/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@
2525
**/*.iml
2626
**/.idea/saveactions_settings.xml
2727
**/.idea/assetWizardSettings.xml
28-
**/.idea/jarRepositories.xml
28+
**/.idea/jarRepositories.xml
29+
30+
**/.idea/compiler.xml

Sources/.idea/compiler.xml

Lines changed: 0 additions & 21 deletions
This file was deleted.

Sources/sdk-stubs/src/main/java/sun/misc/Unsafe.java

Lines changed: 132 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -34,151 +34,139 @@
3434
*/
3535
public class Unsafe {
3636

37-
public Object allocateInstance(Class<?> clazz) throws InstantiationException {
38-
/* null implementation */return null;
39-
}
40-
41-
public int arrayIndexScale(Class arrayClass) {
42-
/* null implementation */return 0;
43-
}
44-
45-
public int arrayBaseOffset(Class arrayClass) {
46-
/* null implementation */return 0;
47-
}
48-
49-
public void copyMemory(long srcAddress, long targetAddress, long length) {
50-
/* null implementation */
51-
}
52-
53-
public void copyMemory(
54-
byte[] src,
55-
long srcIndex,
56-
byte[] target,
57-
long targetIndex,
58-
long length
59-
) {
60-
/* null implementation */
61-
}
62-
63-
public void copyMemory(
64-
Object srcBase,
65-
long srcOffset,
66-
Object destBase,
67-
long destOffset,
68-
long bytes
69-
) {
70-
/* null implementation */
71-
}
72-
73-
public boolean getBoolean(Object o, long offset) {
74-
/* null implementation */return false;
75-
}
76-
77-
public boolean getBoolean(long address) {
78-
/* null implementation */return false;
79-
}
80-
81-
public byte getByte(Object o, long offset) {
82-
/* null implementation */return 0;
83-
}
84-
85-
public byte getByte(long address) {
86-
/* null implementation */return 0;
87-
}
88-
89-
public float getFloat(Object o, long offset) {
90-
/* null implementation */return 0;
91-
}
92-
93-
public double getDouble(Object o, long offset) {
94-
/* null implementation */return 0;
95-
}
96-
97-
public short getShort(Object o, long offset) {
98-
/* null implementation */return 0;
99-
}
100-
101-
public int getInt(Object o, long offset) {
102-
/* null implementation */return 0;
103-
}
104-
105-
public int getInt(long address) {
106-
/* null implementation */return 0;
107-
}
108-
109-
public long getLong(Object o, long offset) {
110-
/* null implementation */return 0;
111-
}
112-
113-
public long getLong(long address) {
114-
/* null implementation */return 0;
115-
}
116-
117-
public Object getObject(Object o, long offset) {
118-
/* null implementation */return null;
119-
}
120-
121-
public long objectFieldOffset(java.lang.reflect.Field f) {
122-
/* null implementation */return 0;
123-
}
124-
125-
public void putBoolean(Object o, long offset, boolean x) {
126-
/* null implementation */
127-
}
128-
129-
public void putBoolean(long address, boolean x) {
130-
/* null implementation */
131-
}
132-
133-
public void putByte(Object o, long offset, byte x) {
134-
/* null implementation */
135-
}
136-
137-
public void putByte(long address, byte x) {
138-
/* null implementation */
139-
}
140-
141-
public void putFloat(Object o, long offset, float x) {
142-
/* null implementation */
143-
}
144-
145-
public void putDouble(Object o, long offset, double x) {
146-
/* null implementation */
147-
}
148-
149-
public void putShort(Object o, long offset, short x) {
150-
/* null implementation */
151-
}
152-
153-
public void putInt(Object o, long offset, int x) {
154-
/* null implementation */
155-
}
156-
157-
public void putInt(long address, int x) {
158-
/* null implementation */
159-
}
160-
161-
public void putLong(Object o, long offset, long x) {
162-
/* null implementation */
163-
}
164-
165-
public void putLong(long address, long x) {
166-
/* null implementation */
167-
}
168-
169-
public void putObject(Object o, long offset, Object x) {
170-
/* null implementation */
171-
}
37+
public Object allocateInstance(Class<?> clazz) throws InstantiationException {
38+
/* null implementation */return null;
39+
}
17240

173-
public Object staticFieldBase(java.lang.reflect.Field f) {
174-
/* null implementation */return null;
175-
}
41+
public int arrayIndexScale(Class arrayClass) {
42+
/* null implementation */return 0;
43+
}
17644

177-
public long staticFieldOffset(java.lang.reflect.Field f) {
178-
/* null implementation */return 0;
179-
}
45+
public int arrayBaseOffset(Class arrayClass) {
46+
/* null implementation */return 0;
47+
}
18048

181-
public void freeMemory(long address) {
182-
/* null implementation */
183-
}
49+
public void copyMemory(long srcAddress, long targetAddress, long length) {
50+
/* null implementation */
51+
}
52+
53+
public void copyMemory(byte[] src, long srcIndex, byte[] target, long targetIndex, long length) {
54+
/* null implementation */
55+
}
56+
57+
public void copyMemory(Object srcBase, long srcOffset, Object destBase, long destOffset, long bytes) {
58+
/* null implementation */
59+
}
60+
61+
public boolean getBoolean(Object o, long offset) {
62+
/* null implementation */return false;
63+
}
64+
65+
public boolean getBoolean(long address) {
66+
/* null implementation */return false;
67+
}
68+
69+
public byte getByte(Object o, long offset) {
70+
/* null implementation */return 0;
71+
}
72+
73+
public byte getByte(long address) {
74+
/* null implementation */return 0;
75+
}
76+
77+
public float getFloat(Object o, long offset) {
78+
/* null implementation */return 0;
79+
}
80+
81+
public double getDouble(Object o, long offset) {
82+
/* null implementation */return 0;
83+
}
84+
85+
public short getShort(Object o, long offset) {
86+
/* null implementation */return 0;
87+
}
88+
89+
public int getInt(Object o, long offset) {
90+
/* null implementation */return 0;
91+
}
92+
93+
public int getInt(long address) {
94+
/* null implementation */return 0;
95+
}
96+
97+
public long getLong(Object o, long offset) {
98+
/* null implementation */return 0;
99+
}
100+
101+
public long getLong(long address) {
102+
/* null implementation */return 0;
103+
}
104+
105+
public Object getObject(Object o, long offset) {
106+
/* null implementation */return null;
107+
}
108+
109+
public long objectFieldOffset(java.lang.reflect.Field f) {
110+
/* null implementation */return 0;
111+
}
112+
113+
public void putBoolean(Object o, long offset, boolean x) {
114+
/* null implementation */
115+
}
116+
117+
public void putBoolean(long address, boolean x) {
118+
/* null implementation */
119+
}
120+
121+
public void putByte(Object o, long offset, byte x) {
122+
/* null implementation */
123+
}
124+
125+
public void putByte(long address, byte x) {
126+
/* null implementation */
127+
}
128+
129+
public void putFloat(Object o, long offset, float x) {
130+
/* null implementation */
131+
}
132+
133+
public void putDouble(Object o, long offset, double x) {
134+
/* null implementation */
135+
}
136+
137+
public void putShort(Object o, long offset, short x) {
138+
/* null implementation */
139+
}
140+
141+
public void putInt(Object o, long offset, int x) {
142+
/* null implementation */
143+
}
144+
145+
public void putInt(long address, int x) {
146+
/* null implementation */
147+
}
148+
149+
public void putLong(Object o, long offset, long x) {
150+
/* null implementation */
151+
}
152+
153+
public void putLong(long address, long x) {
154+
/* null implementation */
155+
}
156+
157+
public void putObject(Object o, long offset, Object x) {
158+
/* null implementation */
159+
}
160+
161+
public Object staticFieldBase(java.lang.reflect.Field f) {
162+
/* null implementation */return null;
163+
}
164+
165+
public long staticFieldOffset(java.lang.reflect.Field f) {
166+
/* null implementation */return 0;
167+
}
168+
169+
public void freeMemory(long address) {
170+
/* null implementation */
171+
}
184172
}

Sources/sdk/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
minSdkVersion 15
2727
targetSdkVersion 31
2828
versionCode 1
29-
versionName "1.18.1"
29+
versionName "1.18.2"
3030
buildConfigField "String", SDK_VERSION, "\"$versionName\""
3131
buildConfigField "Integer", API_LEVEL, '40'
3232
buildConfigField "Integer", MESSAGING_API_LEVEL, '11'
@@ -140,7 +140,7 @@ dependencies {
140140
testImplementation "com.google.android.gms:play-services-location:$playServicesVersion"
141141
testImplementation "com.google.android.gms:play-services-nearby:$playServicesVersion"
142142
testImplementation "androidx.appcompat:appcompat:$androidXLibraryVersion"
143-
testImplementation 'org.robolectric:robolectric:4.5.1'
143+
testImplementation 'org.robolectric:robolectric:4.7.1'
144144

145145
testImplementation "org.powermock:powermock-module-junit4:2.0.7"
146146
testImplementation "org.powermock:powermock-module-junit4-rule:2.0.7"

Sources/sdk/proguard-sdk-release.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
-dontwarn javax.annotation.**
55
-dontusemixedcaseclassnames
66

7+
# Removing this will have R8 repackage classes at root "a"/"b"/etc packages, potentially causing
8+
# conflicts. An alternative would be "-keeppackagenames" but it makes an heavier AAR
9+
-flattenpackagehierarchy 'com.batch.android'
710
-keepparameternames
811
-renamesourcefileattribute SourceFile
912
-keepattributes Exceptions,InnerClasses,Signature,Deprecated,

Sources/sdk/src/androidTest/java/com/batch/android/AdvertisingIDTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
@SmallTest
2121
public class AdvertisingIDTest {
2222

23-
/**
24-
* Test advertising ID value
25-
*
26-
* @throws Exception
27-
*/
28-
@Test
29-
public void testAdvertisingID() throws Exception {
30-
AdvertisingID device = AdvertisingIDProvider.get();
23+
/**
24+
* Test advertising ID value
25+
*
26+
* @throws Exception
27+
*/
28+
@Test
29+
public void testAdvertisingID() throws Exception {
30+
AdvertisingID device = AdvertisingIDProvider.get();
3131

32-
Thread.sleep(2000);
32+
Thread.sleep(2000);
3333

34-
assertTrue(device.isReady());
35-
assertNotNull(device.get());
36-
}
34+
assertTrue(device.isReady());
35+
assertNotNull(device.get());
36+
}
3737
}

Sources/sdk/src/androidTest/java/com/batch/android/TestApplication.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
public class TestApplication extends Application {
77

8-
@Override
9-
public void onCreate() {
10-
super.onCreate();
11-
FirebaseApp.initializeApp(this);
12-
Batch.setConfig(new com.batch.android.Config("FAKE_API_KEY"));
13-
}
8+
@Override
9+
public void onCreate() {
10+
super.onCreate();
11+
FirebaseApp.initializeApp(this);
12+
Batch.setConfig(new com.batch.android.Config("FAKE_API_KEY"));
13+
}
1414
}

0 commit comments

Comments
 (0)