Merge pull request #255 from Countly/staging

Staging 24.1.2

Author: turtledreams

.idea/modules/app-java/countly-sdk-java.app-java.main.iml

@@ -1,3 +1,15 @@
+## 24.1.2
+* !! Major Breaking Change !! Minimum JDK support is 19 for this minor.
+
+* Migrated from Sonatype OSSRH.
+* Added a new configuration function "addCustomNetworkRequestHeaders(Map<String, String>)" to add custom request headers to each request.
+
+## 24.1.1
+
+* Added a new function "setID(newDeviceId)" for managing device id changes according to the device ID Type.
+
+* Mitigated an issue where json and junit dependencies had vulnerabilities.
+
 ## 24.1.0
 
 * !! Major breaking change !! The following method and its functionality is deprecated from the "UserEditor" interface and will not function anymore:

.idea/modules/app-java/countly-sdk-java.app-java.test.iml

@@ -37,7 +37,7 @@ private static void recordView() {
         segmentation.put("segment", "Windows");
         segmentation.put("start", "1");
 
-        Countly.instance().backendM().recordView(DEVICE_ID, "SampleView", segmentation, 1646640780130L);
+        Countly.instance().backendM().recordView(DEVICE_ID, "SampleView", segmentation, 1_646_640_780_130L);
     }
 
     private static void recordEvent() {
@@ -298,7 +298,7 @@ public static void main(String[] args) throws Exception {
         Config config = new Config(COUNTLY_SERVER_URL, COUNTLY_APP_KEY)
             .setLoggingLevel(Config.LoggingLevel.DEBUG)
             .enableBackendMode()
-            .setRequestQueueMaxSize(10000)
+            .setRequestQueueMaxSize(10_000)
             .setDeviceIdStrategy(Config.DeviceIdStrategy.UUID)
             .setRequiresConsent(false)
             .setEventQueueSizeToSend(1000);

.idea/modules/sdk-java/countly-sdk-java.sdk-java.iml

@@ -40,7 +40,7 @@ private static void initSDK(int eventQueueSize, int requestQueueSize) {
 
     static void performLargeRequestQueueSizeTest() {
         DemoUtils.println("===== Test Started: 'Large request queue size' =====");
-        int requestQSize = 1000000;
+        int requestQSize = 1_000_000;
         DemoUtils.printf("Before SDK Initialization: Total Memory = %dMb, Available RAM = %dMb %n", Device.dev.getRAMTotal(), Device.dev.getRAMAvailable());
         initSDK(1, requestQSize);
         DemoUtils.printf("After SDK Initialization: Total Memory = %d Mb, Available RAM= %d Mb %n", Device.dev.getRAMTotal(), Device.dev.getRAMAvailable());
@@ -121,7 +121,7 @@ static void performLargeEventQueueTest() {
         DemoUtils.printf("After SDK Initialization: Total Memory = %d Mb, Available RAM= %d Mb %n", Device.dev.getRAMTotal(), Device.dev.getRAMAvailable());
         int noOfDevices = 10;
         for (int d = 0; d <= noOfDevices; ++d) {
-            DemoUtils.printf("Adding %d events into event Queue against deviceID = %s%n", 1_000_00, "device-id-" + d);
+            DemoUtils.printf("Adding %d events into event Queue against deviceID = %s%n", 100_000, "device-id-" + d);
             for (int i = 1; i <= noOfEvents; ++i) {
 
                 Map<String, Object> segment = new ConcurrentHashMap<>();

.idea/modules/sdk-java/countly-sdk-java.sdk-java.main.iml

@@ -210,9 +210,14 @@ public static void main(String[] args) throws Exception {
             }
         }
 
+        Map<String, String> customNetworkRequestHeaders = new ConcurrentHashMap<>();
+        customNetworkRequestHeaders.put("X-Countly-Example", "true");
+        customNetworkRequestHeaders.put("X-Countly-Example-Version", "1.0");
+
         Config config = new Config(COUNTLY_SERVER_URL, COUNTLY_APP_KEY, sdkStorageRootDirectory)
             .setLoggingLevel(Config.LoggingLevel.DEBUG)
             .setDeviceIdStrategy(Config.DeviceIdStrategy.UUID)
+            .addCustomNetworkRequestHeaders(customNetworkRequestHeaders)
             .enableFeatures(Config.Feature.Events, Config.Feature.Sessions, Config.Feature.CrashReporting, Config.Feature.Views, Config.Feature.UserProfiles, Config.Feature.Location, Config.Feature.Feedback)
             .setRequiresConsent(true)
             //.enableParameterTamperingProtection("test-salt-checksum")

.idea/modules/sdk-java/countly-sdk-java.sdk-java.test.iml

@@ -10,17 +10,17 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'com.google.gms:google-services:4.3.0'
+        classpath 'com.google.gms:google-services:4.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 allprojects {
-    ext.CLY_VERSION = "24.1.0"
+    ext.CLY_VERSION = "24.1.2"
     ext.POWERMOCK_VERSION = "1.7.4"
 
     tasks.withType(Javadoc) {