release: SDK 1.18.3

Author: arnaud-roland

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.java]
+charset = utf-8
+indent_style = space
+indent_size = 4
+continuation_indent_size = 8

Sources/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Sources/gradle.properties

@@ -19,3 +19,4 @@ org.gradle.configureondemand=false
 android.useAndroidX=true
 android.enableJetifier=true
 gnsp.disableApplyOnlyOnRootProjectEnforcement=true
+kotlin.stdlib.default.dependency=false

Sources/gradle/wrapper/gradle-wrapper.properties

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

Sources/sdk-lint/build.gradle

@@ -1,13 +1,17 @@
 apply plugin: 'java-library'
 
+ext {
+    lintVersion = '30.1.2'
+}
+
 dependencies {
-    compileOnly 'com.android.tools.lint:lint-api:30.0.3'
-    compileOnly 'com.android.tools.lint:lint-checks:30.0.3'
+    compileOnly "com.android.tools.lint:lint-api:$lintVersion"
+    compileOnly "com.android.tools.lint:lint-checks:$lintVersion"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "com.android.tools.lint:lint:30.0.3"
-    testImplementation "com.android.tools.lint:lint-tests:30.0.3"
-    testImplementation "com.android.tools:testutils:30.0.3"
+    testImplementation "com.android.tools.lint:lint:$lintVersion"
+    testImplementation "com.android.tools.lint:lint-tests:$lintVersion"
+    testImplementation "com.android.tools:testutils:$lintVersion"
 }
 
 

Sources/sdk/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 def SDK_VERSION = "SDK_VERSION"
 def ENABLE_DEBUG_LOGGER = "ENABLE_DEBUG_LOGGER"
@@ -26,7 +25,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 31
         versionCode 1
-        versionName "1.18.2"
+        versionName "1.18.3"
         buildConfigField "String", SDK_VERSION, "\"$versionName\""
         buildConfigField "Integer", API_LEVEL, '40'
         buildConfigField "Integer", MESSAGING_API_LEVEL, '11'
@@ -62,12 +61,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError true
-        baseline file("lint-baseline.xml")
-        lintConfig file("lint.xml")
-    }
-
     testOptions {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
         unitTests {
@@ -80,6 +73,18 @@ android {
             }
         }
     }
+    lint {
+        abortOnError true
+        baseline file('lint-baseline.xml')
+        lintConfig file('lint.xml')
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 // Prevent from having accidental kotlin in production code
@@ -91,6 +96,13 @@ afterEvaluate {
     }
 }
 
+// Print the sdk version name
+task printVersion {
+    doLast {
+        println project.version
+    }
+}
+
 dependencies {
     compileOnly "com.google.android.gms:play-services-ads:$playServicesVersion"
     compileOnly "com.google.android.gms:play-services-gcm:$playServicesVersion"
@@ -147,7 +159,7 @@ dependencies {
     testImplementation "org.powermock:powermock-api-mockito2:2.0.7"
     testImplementation "org.powermock:powermock-classloading-xstream:2.0.7"
 
-    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_couroutines_version"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_couroutines_version"
 }

Sources/sdk/maven-publish.gradle

@@ -19,50 +19,21 @@ if (signingFile.exists()) {
     }
 }
 
-sourceSets {
-    main {
-        java.srcDirs += 'build/generated'
-    }
-}
-
-task androidJavadocs(type: Javadoc) {
-    source = sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    options.addStringOption('Xdoclint:none', '-quiet')
-    android.libraryVariants.all { variant ->
-        if (variant.name == 'release') {
-            owner.classpath += variant.getCompileClasspath()
-        }
-    }
-    exclude '**/gif/README'
-    exclude '**/R.html', '**/R.*.html', '**/index.html'
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    archiveClassifier.set("javadoc")
-    from androidJavadocs.destinationDir
-}
-
-task androidSourcesJar(type: Jar) {
-    archiveClassifier.set("sources")
-    from sourceSets.main.java.srcDirs
-}
-
 nexusStaging {
     packageGroup = mavenGroupId
 }
 
 publishing {
     publications {
-        batchsdk(MavenPublication) {
+        release(MavenPublication) {
 
             groupId mavenGroupId
             artifactId mavenArtifact
             version android.defaultConfig.versionName
 
-            artifact(project.rootProject.file("../public-sdk/Batch.aar"))
-            artifact androidJavadocsJar
-            artifact androidSourcesJar
+            afterEvaluate {
+                from components.release
+            }
 
             pom {
                 name = "Batch.com Android SDK"
@@ -210,19 +181,6 @@ publishing {
                     url = "https://batch.com"
                 }
             }
-
-            pom.withXml {
-                def dependenciesNode = asNode().appendNode('dependencies')
-
-                // Add dependencies manually as we have only one
-                // See : https://discuss.gradle.org/t/maven-publish-doesnt-include-dependencies-in-the-project-pom-file/8544
-                def dependencyNode = dependenciesNode.appendNode('dependency')
-                dependencyNode.appendNode('groupId', 'androidx.core')
-                dependencyNode.appendNode('artifactId', 'core')
-                dependencyNode.appendNode('version', androidXLibraryVersion)
-                dependencyNode.appendNode('scope', 'compile')
-                dependencyNode.appendNode('type', 'aar')
-            }
         }
     }
 
@@ -246,7 +204,7 @@ publishing {
 }
 
 signing {
-    sign publishing.publications.batchsdk
+    sign publishing.publications.release
 }
 
 // Do not sign if we run the publishToMavenLocal task, useful for dev

Sources/sdk/metalava.gradle

@@ -10,6 +10,14 @@
  * We can compare a previously generated signature file with the current API using the metalavaCompareSignature task.
  */
 
+configurations {
+    metalavaRuntime
+}
+
+dependencies {
+    metalavaRuntime 'com.android.tools.metalava:metalava:1.0.0-alpha04'
+}
+
 /**
  * Recursively list all packages from a directory
  * The package must contains at least one .java file to be included
@@ -39,7 +47,7 @@ void getPackagesInDirectory(File rootDirectory, File directory, Set<String> pack
  */
 List<String> getBaseMetalavaArgs() {
     def args = [
-            '-cp', project.rootProject.file('../prebuilt/*'),
+            '-cp', configurations.metalavaRuntime.asPath,
             'com.android.tools.metalava.Driver',
             '--format=v2',
     ]
@@ -100,17 +108,24 @@ task metalavaGenerateSignature {
         addBaseline(signatureArgs, project.file('metalava-baseline.txt'))
         signatureArgs.addAll([
                 '--source-path', android.sourceSets.main.java.srcDirs.toArray().join(':'),
-                '--api', project.rootProject.file('../metalava-api/' + android.defaultConfig.versionName + '/api.txt')
+                '--api', project.rootProject.file('../metalava-api/api-latest.txt')
         ])
         exec {
             executable = 'java'
             args = signatureArgs
         }
+    }
+}
 
+// Generate a release metalava signature
+// This builds api-latest and copies it to a versioned release
+task("metalavaGenerateTaggedSignature", dependsOn: ["metalavaGenerateSignature"]) {
+    doFirst {
         copy {
-            from project.rootProject.file('../metalava-api/' + android.defaultConfig.versionName + '/api.txt')
-            into project.rootProject.file('../metalava-api')
-            rename 'api.txt', 'api-latest.txt'
+            from project.rootProject.file('../metalava-api/api-latest.txt')
+            into project.rootProject.file('../metalava-api/' + android.defaultConfig.versionName + '/')
+
+            rename 'api-latest.txt', 'api.txt'
         }
     }
 }

Sources/sdk/src/main/java/com/batch/android/BatchDisplayReceiptJobService.java

@@ -14,7 +14,7 @@
  * JobService implementation of Batch Display Receipt
  */
 
-@RequiresApi(api = Build.VERSION_CODES.O)
+@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class BatchDisplayReceiptJobService extends JobService {
 
     private static final String TAG = "BatchDisplayReceiptJobService";

Sources/sdk/src/main/java/com/batch/android/BatchPushNotificationPresenter.java

@@ -377,6 +377,7 @@ public static void presentNotification(
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     userFlags = userFlags | PendingIntent.FLAG_IMMUTABLE;
                 }
+                //noinspection WrongConstant
                 launchIntent.addFlags(userFlags);
             }
         }

Sources/sdk/src/main/java/com/batch/android/messaging/fragment/UniversalTemplateFragment.java

@@ -40,7 +40,6 @@
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Map;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Universal messaging template fragment class. Extends DialogFragment so it can be displayed in its own window easily.
@@ -122,7 +121,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
     @Nullable
     @Override
     public View onCreateView(
-        @NotNull LayoutInflater inflater,
+        @NonNull LayoutInflater inflater,
         @Nullable ViewGroup container,
         @Nullable Bundle savedInstanceState
     ) {

Sources/sdk/src/main/java/com/batch/android/messaging/view/formats/BannerView.java

@@ -193,18 +193,30 @@ private SeparatedFlexboxLayout makeContentLayout(Map<String, String> contentStyl
 
         final List<Pair<View, DOMNode>> views = new LinkedList<>();
 
+        // Title text view
+        View titleTv;
+        DOMNode titleDOMNode = new DOMNode("title");
+        final FlexboxLayout.LayoutParams titleLp = new FlexboxLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        titleLp.flexGrow = 1;
+        titleLp.flexShrink = 0;
         if (!TextUtils.isEmpty(message.titleText)) {
-            final TextView titleTv = new TextView(context);
-            titleTv.setText(message.titleText);
-            final FlexboxLayout.LayoutParams titleLp = new FlexboxLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-            );
-            titleLp.flexGrow = 1;
-            titleLp.flexShrink = 0;
-            titleTv.setLayoutParams(titleLp);
-            views.add(new Pair<>(titleTv, new DOMNode("title", "text")));
+            titleTv = new TextView(context);
+            ((TextView) titleTv).setText(message.titleText);
+            titleDOMNode.classes.add("text");
+        } else {
+            // Insert a dummy view if there is no title, as the text view is used as an anchor
+            // for layouting some styles.
+            // We could improve this using container views/reworking the styles, but this
+            // allows special styling to work without issue.
+            titleTv = new View(context);
+            titleLp.height = 0;
+            titleLp.maxHeight = 0;
         }
+        titleTv.setLayoutParams(titleLp);
+        views.add(new Pair<>(titleTv, titleDOMNode));
 
         // Use an xml, as android:scrollbars is not doable in pure code
         final TextView bodyTv = (TextView) inflater.inflate(

Sources/sdk/src/main/java/com/batch/android/query/response/LocalCampaignsResponse.java

@@ -7,7 +7,6 @@
 import com.batch.android.query.QueryType;
 import java.util.ArrayList;
 import java.util.List;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Response for {@link LocalCampaignsQuery}
@@ -112,7 +111,7 @@ public void setMessage(String message) {
             this.message = message;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return "Error{" + "code=" + code + ", message='" + message + '\'' + '}';

proguard-mappings/1.18.3/checksum.sha

@@ -0,0 +1 @@
+b47b05f7e625d823822e512ef0836e8339d68c60  public-sdk/Batch.aar