Removed screen track and use track event

build.gradle

@@ -1,60 +1,53 @@
+apply plugin: 'com.android.library'
+
 buildscript {
   repositories {
     mavenCentral()
     google()
+    maven { url "https://jitpack.io"  }
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
-    classpath 'com.f2prateek.javafmt:javafmt:0.1.6'
-    classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0'
+    classpath 'com.android.tools.build:gradle:4.1.0'
+    classpath 'com.google.gms:google-services:4.3.15'
   }
 }
 
 // Use -Prelease or $ORG_GRADLE_PROJECT_RELEASE="true" to mark the project as a release
-ext.isRelease = hasProperty('release')
+ext.isRelease = true
 
-apply plugin: 'com.android.library'
-apply plugin: 'com.f2prateek.javafmt'
+group = 'com.segment.analytics.android.integrations'
+version = '2.3.4'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 32
 
   defaultConfig {
-    minSdkVersion 14
-    targetSdkVersion 28
+    minSdkVersion 26
+    targetSdkVersion 32
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_7
-    targetCompatibility JavaVersion.VERSION_1_7
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
   }
 
 
   lintOptions {
     abortOnError false
   }
-
-  testOptions {
-    unitTests {
-      all {
-        jvmArgs '-noverify'
-      }
-      includeAndroidResources = true
-    }
-  }
 }
 
 dependencies {
   repositories {
     mavenCentral()
     jcenter()
     google()
+    maven { url "https://jitpack.io"  }
   }
 
-  api 'com.segment.analytics.android:analytics:4.10.4'
-  implementation 'com.google.firebase:firebase-analytics:18.0.0'
+  api 'com.segment.analytics.android:analytics:4.11.3'
+  implementation 'com.google.firebase:firebase-analytics:21.0.0'
 
   testImplementation 'com.segment.analytics.android:analytics-tests:4.3.1'
   testImplementation 'junit:junit:4.12'
@@ -74,5 +67,4 @@ dependencies {
 
 apply from: rootProject.file('gradle/attach-jar.gradle')
 apply from: rootProject.file('gradle/upload.gradle')
-apply from: rootProject.file('gradle/sign.gradle')
-apply from: rootProject.file('gradle/promote.gradle')
+//apply from: rootProject.file('gradle/promote.gradle')

gradle.properties

@@ -19,3 +19,5 @@ POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=segmentio
 POM_DEVELOPER_NAME=Segment, Inc.
+
+android.useAndroidX=true

gradle/attach-jar.gradle

@@ -1,12 +1,15 @@
-// Attaches a JAR to the archives artifact for a library
 android.libraryVariants.all { variant ->
-  // Only attach a jar for non-debug build types.
-  if (!variant.buildType.isDebuggable()) {
+    // Only attach a jar for non-debug build types.
     def name = variant.buildType.name
-    def task = project.tasks.create "jar${name.capitalize()}", Jar
-    task.dependsOn variant.javaCompile
-    // Include Java classes
-    task.from variant.javaCompile.destinationDir
-    artifacts.add('archives', task);
-  }
-}
+    def task = project.tasks.create("jar${name.capitalize()}", Jar) {
+        dependsOn variant.javaCompileProvider
+        // Include Java classes
+        from variant.javaCompileProvider.get().destinationDirectory
+    }
+    artifacts.add('archives', task)
+
+    // Add JVM arguments to the javaCompile task
+    variant.javaCompileProvider.configure {
+        options.forkOptions.jvmArgs += ['--add-opens', 'java.base/java.io=ALL-UNNAMED']
+    }
+}

gradle/upload.gradle

@@ -14,60 +14,7 @@
  * limitations under the License.
  */
 
-apply plugin: 'maven'
-
 afterEvaluate { project ->
-  uploadArchives {
-    repositories {
-      mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        def userName = System.getenv("NEXUS_USERNAME")
-        def password = System.getenv("NEXUS_PASSWORD")
-
-        pom.groupId = GROUP
-        pom.artifactId = POM_ARTIFACT_ID
-        pom.version = isRelease ? VERSION.replace('-SNAPSHOT', '') : VERSION
-
-        repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-          authentication(userName: userName, password: password)
-        }
-        snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-          authentication(userName: userName, password: password)
-        }
-
-        pom.project {
-          name POM_NAME
-          packaging POM_PACKAGING
-          description POM_DESCRIPTION
-          url POM_URL
-
-          scm {
-            url POM_SCM_URL
-            connection POM_SCM_CONNECTION
-            developerConnection POM_SCM_DEV_CONNECTION
-          }
-
-          licenses {
-            license {
-              name POM_LICENCE_NAME
-              url POM_LICENCE_URL
-              distribution POM_LICENCE_DIST
-            }
-          }
-
-          developers {
-            developer {
-              id POM_DEVELOPER_ID
-              name POM_DEVELOPER_NAME
-            }
-          }
-        }
-      }
-    }
-  }
-
-
   task androidJavadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 23 10:10:41 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+android.useAndroidX=true

src/main/java/com/segment/analytics/android/integrations/firebase/FirebaseIntegration.java

@@ -6,7 +6,6 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-
 import com.google.firebase.analytics.FirebaseAnalytics;
 import com.google.firebase.analytics.FirebaseAnalytics.Event;
 import com.google.firebase.analytics.FirebaseAnalytics.Param;
@@ -18,12 +17,10 @@
 import com.segment.analytics.integrations.Logger;
 import com.segment.analytics.integrations.TrackPayload;
 import com.segment.analytics.integrations.ScreenPayload;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import static com.segment.analytics.internal.Utils.hasPermission;
 import static com.segment.analytics.internal.Utils.isNullOrEmpty;
 
@@ -192,9 +189,13 @@ public void track(TrackPayload track) {
   public void screen(ScreenPayload screen) {
     super.screen(screen);
 
-    if (this.currentActivity != null) {
-      firebaseAnalytics.setCurrentScreen(this.currentActivity, screen.name(), null);
+    Bundle propertiesBundle = new Bundle();
+    for (Map.Entry<String, Object> entry : screen.entrySet()) {
+      propertiesBundle.putString(entry.getKey(), entry.getValue().toString());
     }
+    propertiesBundle.putString(FirebaseAnalytics.Param.SCREEN_NAME, screen.name());
+    firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW, propertiesBundle);
+    logger.verbose("firebaseAnalytics.screen(activity, %s, null);", screen.name());
   }
 
   private static Bundle formatProperties(Properties properties) {