Staging 24.1.2

CHANGELOG.md

@@ -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:

app-java/src/main/java/ly/count/java/demo/BackendModeExample.java

@@ -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);

app-java/src/main/java/ly/count/java/demo/BackendModePerformanceTests.java

@@ -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<>();

app-java/src/main/java/ly/count/java/demo/Example.java

@@ -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")

build.gradle

@@ -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) {

gradle.properties

@@ -18,7 +18,7 @@
 # org.gradle.parallel=true
 
 # RELEASE FIELD SECTION
-VERSION_NAME=24.1.0
+VERSION_NAME=24.1.2
 GROUP=ly.count.sdk
 
 POM_URL=https://github.com/Countly/countly-sdk-java
@@ -31,4 +31,5 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_NAME=Countly
 
 # Publishing properties
-SONATYPE_AUTOMATIC_RELEASE=true
+SONATYPE_HOST=CENTRAL_PORTAL
+RELEASE_SIGNING_ENABLED=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ruleset.xml

@@ -93,7 +93,9 @@
         </properties>
     </rule>
     <rule ref="category/java/codestyle.xml/MDBAndSessionBeanNamingConvention" />
+    <!--
     <rule ref="category/java/codestyle.xml/MethodArgumentCouldBeFinal" />
+    -->
     <rule ref="category/java/codestyle.xml/NoPackage" />    
     <rule ref="category/java/codestyle.xml/PrematureDeclaration" />
     <rule ref="category/java/codestyle.xml/RemoteInterfaceNamingConvention" />
@@ -284,6 +286,7 @@
 
     <!-- Documentation rules -->
     <rule ref="category/java/documentation.xml/CommentContent" />
+    <!--
     <rule ref="category/java/documentation.xml/CommentRequired">
         <properties>
             <property name="methodWithOverrideCommentRequirement" value="Ignored" />
@@ -297,6 +300,7 @@
             <property name="serialPersistentFieldsCommentRequired" value="Ignored" />
         </properties>
     </rule>
+    -->
     <rule ref="category/java/documentation.xml/CommentSize">
         <properties>
             <property name="maxLines" value="10" />
@@ -319,7 +323,9 @@
     <rule ref="category/java/errorprone.xml/AvoidCatchingNPE" />
     <rule ref="category/java/errorprone.xml/AvoidCatchingThrowable" /><!--???-->
     <rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor" />
+    <!--
     <rule ref="category/java/errorprone.xml/AvoidDuplicateLiterals" />
+    -->
     <rule ref="category/java/errorprone.xml/AvoidEnumAsIdentifier" />
     <rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingMethodName" />
     <rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingTypeName" />
@@ -449,4 +455,4 @@
     <rule ref="category/java/security.xml/HardCodedCryptoKey" />
     <rule ref="category/java/security.xml/InsecureCryptoIv" />
 
-</ruleset>
+</ruleset>

sdk-java/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'java-library'
-apply plugin: 'maven'
+// apply plugin: 'maven'
 
 
 buildscript {
@@ -8,15 +8,15 @@ buildscript {
     //mavenLocal()
   }
   dependencies {
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0' //for publishing
+    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0' //for publishing
   }
 }
 
 dependencies {
-  implementation 'org.json:json:20230227'
+  implementation 'org.json:json:20250107'
   implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
-  testImplementation 'junit:junit:4.12'
+  testImplementation 'junit:junit:4.13.1'
   testImplementation 'org.mockito:mockito-core:2.8.9'
   testImplementation "org.powermock:powermock-core:${POWERMOCK_VERSION}"
   testImplementation "org.powermock:powermock-module-junit4:${POWERMOCK_VERSION}"