release: SDK 1.18.0

Author: abarisain

.gitignore

@@ -12,6 +12,7 @@ javadoc
 public-sdk/Batch.aar
 public-sdk/Batch.aar.asc
 public-sdk/Batch.mapping.txt
+node_modules/
 
 # Recommended ignore from Gradle
 **/.idea/dataSources.*

Sources/.idea/codeStyles/Project.xml

@@ -1,16 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.21'
     ext.kotlin_couroutines_version = '1.3.2'
 
     repositories {
         mavenCentral()
         google()
-        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         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
@@ -23,6 +22,5 @@ allprojects {
     repositories {
         mavenCentral()
         google()
-        jcenter()
     }
 }

Sources/.idea/runConfigurations.xml

@@ -13,10 +13,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
 org.gradle.caching=true
-android.enableBuildCache=true
-android.enableD8.desugaring=true
 org.gradle.configureondemand=false
 android.useAndroidX=true
 android.enableJetifier=true

Sources/.idea/runConfigurations/sdk_tests_junit_gradle.xml

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

Sources/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'java-library'
 
 dependencies {
-    compileOnly 'com.android.tools.lint:lint-api:26.6.3'
-    compileOnly 'com.android.tools.lint:lint-checks:26.6.3'
+    compileOnly 'com.android.tools.lint:lint-api:30.0.3'
+    compileOnly 'com.android.tools.lint:lint-checks:30.0.3'
 
     testImplementation "junit:junit:4.12"
-    testImplementation "com.android.tools.lint:lint:26.6.3"
-    testImplementation "com.android.tools.lint:lint-tests:26.6.3"
-    testImplementation "com.android.tools:testutils:26.6.3"
+    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"
 }
 
 
@@ -16,3 +16,8 @@ jar {
         attributes("Lint-Registry-v2": "com.batch.android.lint.BatchIssueRegistry")
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

Sources/gradle.properties

@@ -1,10 +1,12 @@
 package com.batch.android.lint;
 
 import com.android.tools.lint.client.api.IssueRegistry;
+import com.android.tools.lint.client.api.Vendor;
 import com.android.tools.lint.detector.api.ApiKt;
 import com.android.tools.lint.detector.api.Issue;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.List;
@@ -19,6 +21,19 @@ public int getApi()
         return ApiKt.CURRENT_API;
     }
 
+    @Override
+    public int getMinApi()
+    {
+        return 6;
+    }
+
+    @Nullable
+    @Override
+    public Vendor getVendor()
+    {
+        return new Vendor("Batch.com", "com.batch.android", "https://batch.com", "Batch SDK Team via email/slack");
+    }
+
     @NotNull
     @Override
     public List<Issue> getIssues()

Sources/gradle/wrapper/gradle-wrapper.properties

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

Sources/sdk-lint/build.gradle

@@ -17,19 +17,19 @@ ext {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultPublishConfig "release"
 
     resourcePrefix "com_batchsdk_"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
-        versionName "1.17.3"
+        versionName "1.18.0"
         buildConfigField "String", SDK_VERSION, "\"$versionName\""
-        buildConfigField "Integer", API_LEVEL, '36'
-        buildConfigField "Integer", MESSAGING_API_LEVEL, '10'
+        buildConfigField "Integer", API_LEVEL, '40'
+        buildConfigField "Integer", MESSAGING_API_LEVEL, '11'
         buildConfigField "String", WS_DOMAIN, '"ws.batch.com"'
 
         consumerProguardFiles 'proguard-consumer-rules.txt'
@@ -98,7 +98,7 @@ dependencies {
     compileOnly "com.google.android.gms:play-services-nearby:$playServicesVersion"
     compileOnly 'com.google.android.play:core:1.9.0'
     compileOnly "com.google.firebase:firebase-core:17.4.3"
-    compileOnly "com.google.firebase:firebase-messaging:20.2.1"
+    compileOnly "com.google.firebase:firebase-messaging:22.0.0"
     compileOnly project(':sdk-stubs')
     compileOnly project(':sdk-processor')
     annotationProcessor project(':sdk-processor')
@@ -111,12 +111,12 @@ dependencies {
 
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation "androidx.annotation:annotation:$androidXLibraryVersion"
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test.ext:truth:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:truth:1.4.0'
     androidTestImplementation 'org.mockito:mockito-android:3.2.0'
 
     androidTestImplementation "com.google.android.gms:play-services-ads:$playServicesVersion"
@@ -128,13 +128,13 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:3.2.0'
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'androidx.test:rules:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation 'androidx.test.ext:junit-ktx:1.1.1'
-    testImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-    testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    testImplementation 'androidx.test.ext:truth:1.2.0'
+    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation 'androidx.test:rules:1.4.0'
+    testImplementation 'androidx.test.ext:junit:1.1.3'
+    testImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+    testImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
+    testImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation 'androidx.test.ext:truth:1.4.0'
     testImplementation "com.google.android.gms:play-services-ads:$playServicesVersion"
     testImplementation "com.google.android.gms:play-services-gcm:$playServicesVersion"
     testImplementation "com.google.android.gms:play-services-location:$playServicesVersion"

Sources/sdk-lint/src/main/java/com/batch/android/lint/BatchIssueRegistry.java

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0" client="gradle" variant="debug" version="4.2.0">
+<issues format="6" by="lint 7.0.3" type="baseline" client="gradle" name="AGP (7.0.3)" variant="all" version="7.0.3">
 
 </issues>

Sources/sdk-stubs/build.gradle

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+	<issue id="AnnotateVersionCheck" severity="error" />
+	<issue id="UnspecifiedImmutableFlag" severity="error" />
 	<issue id="OldTargetApi" severity="warning" />
 
 	<!-- android.lintOptions.warningsAsErrors should do this but ... IDK -->

Sources/sdk/build.gradle

@@ -19,6 +19,35 @@ 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
 }
@@ -32,6 +61,8 @@ publishing {
             version android.defaultConfig.versionName
 
             artifact(project.rootProject.file("../public-sdk/Batch.aar"))
+            artifact androidJavadocsJar
+            artifact androidSourcesJar
 
             pom {
                 name = "Batch.com Android SDK"