release: SDK 1.19.1

arnaud-roland · arnaud-roland · commit 84d58dbb42b3 · 2022-06-03T11:10:59.000+02:00
diff --git a/Sources/build.gradle b/Sources/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        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
diff --git a/Sources/gradle.properties b/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
diff --git a/Sources/gradle/wrapper/gradle-wrapper.properties b/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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Sources/sdk/build.gradle b/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 32
         versionCode 1
-        versionName "1.19.0"
+        versionName "1.19.1"
         buildConfigField "String", SDK_VERSION, "\"$versionName\""
         buildConfigField "Integer", API_LEVEL, '50'
         buildConfigField "Integer", MESSAGING_API_LEVEL, '12'
@@ -80,6 +79,13 @@ android {
         baseline file('lint-baseline.xml')
         lintConfig file('lint.xml')
     }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 // Prevent from having accidental kotlin in production code
@@ -91,6 +97,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 +160,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"
 }
diff --git a/Sources/sdk/maven-publish.gradle b/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
diff --git a/Sources/sdk/metalava.gradle b/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'
         }
     }
 }
diff --git a/Sources/sdk/src/main/java/com/batch/android/BatchEventDispatcher.java b/Sources/sdk/src/main/java/com/batch/android/BatchEventDispatcher.java
@@ -13,6 +13,10 @@ public interface BatchEventDispatcher {
     /**
      * Get the name of the dispatcher
      * This information is only used for analytics
+     *
+     * /!\ `default` method can lead to an AbstractMethodError if java 8 language features are not available (api < 24).
+     * Ensure catching the exception when using this method or use reflection check.
+     *
      * @return the name of the dispatcher
      */
     @Nullable
@@ -23,6 +27,10 @@ default String getName() {
     /**
      * Get the version of the dispatcher
      * This information is only used for analytics
+     *
+     * /!\ `default` method can lead to an AbstractMethodError if java 8 language features are not available (api < 24).
+     * Ensure catching the exception when using this method or use reflection check.
+     *
      * @return the version of the dispatcher
      */
     default int getVersion() {
diff --git a/Sources/sdk/src/main/java/com/batch/android/BatchPushMessageReceiver.java b/Sources/sdk/src/main/java/com/batch/android/BatchPushMessageReceiver.java
@@ -92,9 +92,10 @@ protected boolean presentNotification(@NonNull Context context, @NonNull Intent
             try {
                 startPresentationService(context, intent);
                 return true;
-            } catch (IllegalStateException e) {
-                // This exception can happen on Android O, fallback on scheduling a Job.
+            } catch (IllegalStateException | SecurityException e) {
+                // IllegalStateException can happen on Android O, fallback on scheduling a Job.
                 // On earlier Android versions, it should not happen.
+                // The SecurityException happens on some OEMs, like Wiko, for an unknown reason.
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
                     Logger.internal(TAG, "Failed to start service, scheduling Job");
                     return scheduleJob(context, intent);
diff --git a/Sources/sdk/src/main/java/com/batch/android/eventdispatcher/DispatcherSerializer.java b/Sources/sdk/src/main/java/com/batch/android/eventdispatcher/DispatcherSerializer.java
@@ -50,7 +50,7 @@ public static JSONObject serialize(@NonNull Set<BatchEventDispatcher> dispatcher
                     ? dispatcher.getName()
                     : CUSTOM_DISPATCHER_NAME;
                 json.put(name, dispatcher.getVersion());
-            } catch (JSONException ignored) {}
+            } catch (JSONException | AbstractMethodError ignored) {}
         }
         return json;
     }
diff --git a/Sources/sdk/src/main/java/com/batch/android/messaging/fragment/UniversalTemplateFragment.java b/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
     ) {
diff --git a/Sources/sdk/src/main/java/com/batch/android/messaging/view/formats/BannerView.java b/Sources/sdk/src/main/java/com/batch/android/messaging/view/formats/BannerView.java
@@ -193,18 +193,28 @@ private SeparatedFlexboxLayout makeContentLayout(Map<String, String> contentStyl
 
         final List<Pair<View, DOMNode>> views = new LinkedList<>();
 
+        // Title text view
+        View titleTv;
+        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);
+        } 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, new DOMNode("title", "text")));
 
         // Use an xml, as android:scrollbars is not doable in pure code
         final TextView bodyTv = (TextView) inflater.inflate(
diff --git a/Sources/sdk/src/main/java/com/batch/android/metrics/MetricManager.java b/Sources/sdk/src/main/java/com/batch/android/metrics/MetricManager.java
@@ -154,13 +154,13 @@ public void sendMetrics() {
                     new MetricWebserviceListener() {
                         @Override
                         public void onSuccess() {
-                            Logger.info(TAG, "Metrics sent with success.");
+                            Logger.internal(TAG, "Metrics sent with success.");
                             isSending.set(false);
                         }
 
                         @Override
                         public void onFailure(Webservice.WebserviceError error) {
-                            Logger.info(TAG, "Fail sending metrics.");
+                            Logger.internal(TAG, "Fail sending metrics.");
                             long retryAfter = error.getRetryAfterInMillis() != 0
                                 ? error.getRetryAfterInMillis()
                                 : DEFAULT_RETRY_AFTER;
diff --git a/Sources/sdk/src/main/java/com/batch/android/module/EventDispatcherModule.java b/Sources/sdk/src/main/java/com/batch/android/module/EventDispatcherModule.java
@@ -55,6 +55,10 @@ private void printLoadedDispatcher(@NonNull String name) {
         Logger.internal(TAG, "Adding event dispatcher: " + name);
     }
 
+    private void printDeprecatedDispatcher(@NonNull String name) {
+        Logger.warning(TAG, "The version of your event dispatcher: " + name + " is outdated, please update it.");
+    }
+
     public void addEventDispatcher(BatchEventDispatcher dispatcher) {
         synchronized (eventDispatchers) {
             eventDispatchers.add(dispatcher);
@@ -118,17 +122,16 @@ public void loadDispatcherFromContext(Context context) {
                 if (dispatcher != null) {
                     addEventDispatcher(dispatcher);
                     String dispatcherName = dispatcher.getClass().getName();
-                    if (dispatcher.getName() != null) {
-                        dispatcherName = dispatcher.getName();
-                    } else {
-                        Logger.warning(
-                            TAG,
-                            "The version of your event dispatcher: " +
-                            dispatcherName +
-                            " is outdated, please update it."
-                        );
+                    try {
+                        if (dispatcher.getName() != null) {
+                            dispatcherName = dispatcher.getName();
+                        } else {
+                            printDeprecatedDispatcher(dispatcherName);
+                        }
+                        printLoadedDispatcher(dispatcherName);
+                    } catch (AbstractMethodError e) {
+                        printDeprecatedDispatcher(dispatcherName);
                     }
-                    printLoadedDispatcher(dispatcherName);
                 }
             } catch (Throwable e) {
                 Logger.error(String.format("Could not instantiate %s", name), e);
@@ -138,6 +141,7 @@ public void loadDispatcherFromContext(Context context) {
 
     /**
      * Get dispatchers as json object used for the analytics
+     *
      * @return A JSONObject of dispatcher Name:Version
      */
     @Nullable
diff --git a/Sources/sdk/src/main/java/com/batch/android/query/response/LocalCampaignsResponse.java b/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}
@@ -193,7 +192,7 @@ public void setMessage(String message) {
             this.message = message;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return "Error{" + "code=" + code + ", message='" + message + '\'' + '}';
diff --git a/proguard-mappings/1.19.1/checksum.sha b/proguard-mappings/1.19.1/checksum.sha
@@ -0,0 +1 @@
+07baf678e298664f46436f29c628f0ba904466e5  public-sdk/Batch.aar
diff --git a/proguard-mappings/1.19.1/mapping.txt b/proguard-mappings/1.19.1/mapping.txt

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`google()`
`10`	`10`	`}`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:7.1.2'`
	`12`	`+ classpath 'com.android.tools.build:gradle:7.2.1'`
`13`	`13`	`classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1"`
`14`	`14`	`// NOTE: Do not place your application dependencies here; they belong`
`15`	`15`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static JSONObject serialize(@NonNull Set<BatchEventDispatcher> dispatcher`
`50`	`50`	`? dispatcher.getName()`
`51`	`51`	`: CUSTOM_DISPATCHER_NAME;`
`52`	`52`	`json.put(name, dispatcher.getVersion());`
`53`		`- } catch (JSONException ignored) {}`
	`53`	`+ } catch (JSONException \| AbstractMethodError ignored) {}`
`54`	`54`	`}`
`55`	`55`	`return json;`
`56`	`56`	`}`