Android SDK v3.12.4 | Issue in dependencies download from Maven

Author: ishaileshmishra

README.md

@@ -261,7 +261,7 @@ You can use advanced sync queries to fetch custom results while performing initi
 
 ### The MIT License (MIT)
 
-Copyright © 2012-2023 [Contentstack](https://www.contentstack.com/). All Rights Reserved
+Copyright © 2012-2024 [Contentstack](https://www.contentstack.com/). All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software
 and associated documentation files (the "Software"), to deal in the Software without restriction,

SECURITY.md

@@ -1,4 +1,4 @@
-## Security
+# Security
 
 Contentstack takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations.
 
@@ -14,14 +14,14 @@ You should receive a response within 24 hours. If for some reason you do not, pl
 
 Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
 
-* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
-* Full paths of source file(s) related to the manifestation of the issue
-* The location of the affected source code (tag/branch/commit or direct URL)
-* Any special configuration required to reproduce the issue
-* Step-by-step instructions to reproduce the issue
-* Proof-of-concept or exploit code (if possible)
-* Impact of the issue, including how an attacker might exploit the issue
+- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+- Full paths of source file(s) related to the manifestation of the issue
+- The location of the affected source code (tag/branch/commit or direct URL)
+- Any special configuration required to reproduce the issue
+- Step-by-step instructions to reproduce the issue
+- Proof-of-concept or exploit code (if possible)
+- Impact of the issue, including how an attacker might exploit the issue
 
 This information will help us triage your report more quickly.
 
-[https://www.contentstack.com/trust/](https://www.contentstack.com/trust/)
+[https://www.contentstack.com/trust/](https://www.contentstack.com/trust/)

build.gradle

@@ -1,25 +1,23 @@
 buildscript {
-    ext.jacoco_version = '0.8.8'
+    ext {
+        jacoco_version = '0.8.8'
+        agp_version = '8.2.1'
+    }
     repositories {
         maven {
-            url = uri("https://storage.googleapis.com/r8-releases/raw")
             url "https://plugins.gradle.org/m2/"
         }
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.2.2" //7.0.4
-        classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
+        classpath "com.android.tools.build:gradle:8.2.1" //8.2.1
+        classpath 'io.github.gradle-nexus:publish-plugin:2.0.0-rc-1'
         classpath "org.jacoco:org.jacoco.core:$jacoco_version"
-        classpath "com.android.tools:r8:8.1.56"
     }
 }
 
-apply plugin: 'io.github.gradle-nexus.publish-plugin'
-apply from: "${rootDir}/scripts/publish-root.gradle"
-
 tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

contentstack/build.gradle

@@ -1,96 +1,59 @@
 plugins {
-    id 'signing'
-    id 'maven-publish'
-    id 'com.android.library'
-    id 'jacoco'
+    id "com.vanniktech.maven.publish" version "0.27.0"
+    id "com.android.library"
 }
 
-def localProperties = new Properties()
-localProperties.load(new FileInputStream(rootProject.file("local.properties")))
+import com.vanniktech.maven.publish.SonatypeHost
+android.buildFeatures.buildConfig true
 
-group = 'com.contentstack.sdk'
-version = '3.12.4-SNAPSHOT'
+mavenPublishing {
+    publishToMavenCentral(SonatypeHost.DEFAULT)
+    signAllPublications()
+    coordinates("com.contentstack.sdk", "android", "3.12.4-rc2-SNAPSHOT")
 
-
-//publishing {
-//    publications {
-//        mavenJava(MavenPublication) {
-//            artifactId = 'android'
-//            versionMapping {
-//                usage('java-api') {
-//                    fromResolutionOf('runtimeClasspath')
-//                }
-//                usage('java-runtime') {
-//                    fromResolutionResult()
-//                }
-//            }
-//            pom {
-//
-//                name = 'contentstack-android'
-//                packaging 'aar'
-//                artifactId "android"
-//                description = 'Android SDK for Contentstack Content Delivery API, Contentstack is a headless CMS with an API-first approach'
-//                url = 'https://github.com/contentstack/contentstack-android'
-//
-//                scm {
-//                    url 'https://github.com/contentstack/contentstack-android/'
-//                    connection 'scm:git@github.com:contentstack/contentstack-android'
-//                    developerConnection 'scm:git@github.com:contentstack/contentstack-android.git'
-//                }
-//
-//                licenses {
-//                    license {
-//                        name 'The MIT License'
-//                        url 'http://www.opensource.org/licenses/mit-license.php'
-//                        distribution 'repo'
-//                    }
-//                }
-//                developers {
-//                    developer {
-//                        id 'ishaileshmishra'
-//                        name 'Shailesh Mishra'
-//                        email 'mobile@contentstack.com'
-//                    }
-//                }
-//            }
-//        }
-//    }
-//    repositories {
-//        maven {
-//            def releasesRepoUrl = layout.buildDirectory.dir('repos/releases')
-//            def snapshotsRepoUrl = layout.buildDirectory.dir('repos/snapshots')
-//            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-//        }
-//    }
-//}
-
-//signing {
-//    sign publishing.publications.mavenJava
-//}
-
-
-//javadoc {
-//    if (JavaVersion.current().isJava9Compatible()) {
-//        options.addBooleanOption('html5', true)
-//    }
-//}
+    pom {
+        name = "contentstack-android"
+        description = "The Content Delivery SDK facilitates the retrieval of content from your Contentstack account, enabling seamless delivery to your web or mobile properties.."
+        inceptionYear = "2018"
+        url = "https://github.com/contentstack/contentstack-android"
+        licenses {
+            license {
+                name = "The MIT License"
+                url = "https://github.com/contentstack/contentstack-android/blob/master/LICENSE"
+                distribution = "https://github.com/contentstack/contentstack-android/blob/master/LICENSE"
+            }
+        }
+        developers {
+            developer {
+                id = "ishaileshmishra"
+                name = "contentstack"
+                url = "https://github.com/contentstack/contentstack-android"
+            }
+        }
+        scm {
+            url = "scm:git@github.com:contentstack/contentstack-android"
+            connection = "scm:git:git://github.com/username/mylibrary.git"
+            developerConnection = "scm:git@github.com:contentstack/contentstack-android.git"
+        }
+    }
+}
 
 
 tasks.register('jacocoTestReport', JacocoReport) {
-//    dependsOn['testDebugUnitTest', 'createDebugCoverageReport']
+    dependsOn['testDebugUnitTest', 'createDebugCoverageReport']
     reports {
         html.enabled = true
     }
-
-//    afterEvaluate {
-//        classDirectories.setFrom(files(classDirectories.files.collect {
-//            fileTree(dir: it, exclude: '**com/contentstack/okhttp**')
-//            fileTree(dir: it, exclude: '**com/contentstack/okio**')
-//            fileTree(dir: it, exclude: '**com/contentstack/txtmark**')
-//        }))
-//    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: '**com/contentstack/okhttp**')
+            fileTree(dir: it, exclude: '**com/contentstack/okio**')
+            fileTree(dir: it, exclude: '**com/contentstack/txtmark**')
+        }))
+    }
 }
 android {
+    namespace "com.contentstack.sdk"
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
         exclude 'META-INF/LICENSE.md'
@@ -102,6 +65,7 @@ android {
         exclude 'META-INF/ASL2.0'
         exclude("META-INF/*.kotlin_module")
     }
+
     testOptions {
         unitTests.all {
             jacoco {
@@ -125,6 +89,7 @@ android {
     }
     compileSdk 26
     defaultConfig {
+        multiDexEnabled true
         minSdkVersion 19
         versionCode 1
         versionName "1.0"
@@ -133,14 +98,17 @@ android {
         signingConfig signingConfigs.release
     }
 
+
+    def localProperties = new Properties()
+    localProperties.load(new FileInputStream(rootProject.file("local.properties")))
     buildTypes {
         debug {
             debuggable true
             testCoverageEnabled true
             buildConfigField "String", "host", localProperties['host']
             buildConfigField "String", "APIKey", localProperties['APIKey']
             buildConfigField "String", "deliveryToken", localProperties['deliveryToken']
-            buildConfigField "String", "environment", localProperties['env']
+            buildConfigField "String", "environment", localProperties['environment']
             buildConfigField "String", "contentTypeUID", localProperties['contentType']
             buildConfigField "String", "assetUID", localProperties['assetUid']
         }
@@ -149,38 +117,32 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    flavorDimensions "default"
+    //flavorDimensions "default"
     lintOptions { abortOnError false }
     compileOptions {
+        //coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 }
-repositories {
-//    flatDir { dirs 'libs' }
-//    mavenCentral()
-//    mavenLocal()
-}
-
 configurations { archives }
-
 dependencies {
+    def multidex_version = "2.0.1"
     configurations.configureEach { resolutionStrategy.force 'com.android.support:support-annotations:23.1.0' }
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.contentstack.sdk:utils:1.2.6'
-//    implementation 'com.android.support:appcompat-v7:26.1.0'
-//    implementation 'com.android.support:support-v4:26.1.0'
     implementation 'com.android.volley:volley:1.2.1'
     implementation 'junit:junit:4.13.2'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:core:1.5.0'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    implementation "androidx.multidex:multidex:$multidex_version"
 
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 }
-tasks.register('clearJar', Delete) { delete 'build/libs/Contentstack.jar' }
+tasks.register('clearJar', Delete) { delete 'build/libs/contentstack.jar' }
 tasks.register('unzip', Copy) {
     def zipFile = file('build/intermediates/intermediate-jars/release/classes.jar')
     def outputDir = file("${buildDir}/contentstack-jar")
@@ -191,11 +153,6 @@ tasks.register('createJar', Jar) {
     archivesBaseName = "contentstack.jar"
     from('build/contentstack-jar/')
     include 'com/contentstack/'
-    include 'META-INF/'
+    //include 'META-INF/'
 }
 createJar.dependsOn(clearJar, unzip, build)
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}

contentstack/src/androidTest/java/com/contentstack/sdk/AssetTestCase.java

@@ -1,6 +1,6 @@
 package com.contentstack.sdk;
-
 import android.content.Context;
+import android.support.test.InstrumentationRegistry;
 import android.util.Log;
 
 import org.junit.BeforeClass;
@@ -13,10 +13,8 @@
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.TestCase.assertEquals;
 
-import androidx.test.InstrumentationRegistry;
 import androidx.test.core.app.ApplicationProvider;
 
-
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class AssetTestCase {
 

contentstack/src/androidTest/java/com/contentstack/sdk/ExampleInstrumentedTest.java

@@ -4,10 +4,10 @@
 import static org.junit.Assert.assertNotNull;
 
 import android.content.Context;
+import android.support.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 import android.util.Log;
 
 import androidx.test.core.app.ApplicationProvider;
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

contentstack/src/androidTest/java/com/contentstack/sdk/QueryTestCase.java

@@ -1,6 +1,5 @@
 package com.contentstack.sdk;
 
-import android.content.Context;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -13,9 +12,6 @@
 
 import static junit.framework.TestCase.assertEquals;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.core.app.ApplicationProvider;
-
 
 public class QueryTestCase {
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
-#Tue Dec 13 11:19:51 IST 2022
-#gradle-7.6-bin.zip
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists