Release/4.0.0 beta2

.github/workflows/ci-unitest-build.yml

@@ -31,14 +31,27 @@ jobs:
         run: ./gradlew :flagship:clean
       - name: Build with Gradle
         run: ./gradlew :flagship:assembleDebug
+#      - name: Unit tests
+#        run: bash ./gradlew flagship:testJacocoUnitTestCoverage -i --stacktrace
+#      - name: Generate report
+#        run: bash ./gradlew flagship:createJacocoUnitTestCoverageReport
       - name: Unit tests
-        run: bash ./gradlew flagship:testJacocoUnitTestCoverage -i --stacktrace
-      - name: Generate report
-        run: bash ./gradlew flagship:createJacocoUnitTestCoverageReport
+        id: unit_tests
+        continue-on-error: true
+        run: bash ./gradlew flagship:jacocoDebugCodeCoverage -i --stacktrace
+      - name: Upload Test Report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-report
+          path: flagship/build/reports/tests/testDebugUnitTest/
+      - name: Stop if tests failed
+        if: steps.unit_tests.conclusion == 'failure'
+        run: exit 1
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: flagship/build/reports/coverage/test/jacoco/report.xml
+          files: flagship/build/reports/jacoco/jacocoDebugCodeCoverage/jacocoDebugCodeCoverage.xml
       - name: Build
         run: bash ./gradlew flagship:clean flagship:assembleRelease

.github/workflows/release.yml

@@ -26,6 +26,9 @@ jobs:
         run: ./gradlew :flagship:assembleDebug
       - name: Unit tests
         run: bash ./gradlew flagship:testJacocoUnitTestCoverage -i --stacktrace
+      - name: Get version
+        run: |
+          echo "FLAGSHIP_VERSION_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       - name: Generate report
         run: bash ./gradlew flagship:createJacocoUnitTestCoverageReport
       - name: Upload coverage to codecov
@@ -35,12 +38,12 @@ jobs:
           files: flagship/build/reports/coverage/test/jacoco/report.xml
       - name: Build and Publish
         env:
-          SONATYPE_SIGNING_KEY: ${{ secrets.SONATYPE_SIGNING_KEY }}
-          SONATYPE_SIGNING_PWD: ${{ secrets.SONATYPE_SIGNING_PWD }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_REPOSITORY: ${{ secrets.SONATYPE_REPOSITORY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME}}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
         run: |
           bash ./gradlew clean
           bash ./gradlew flagship:assembleRelease
-          bash ./gradlew publishToSonatype closeSonatypeStagingRepository
+          bash ./gradlew publishToMavenCentral --stacktrace

app/release/output-metadata.json

@@ -1,18 +1,37 @@
 {
-  "version": 2,
+  "version": 3,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
   },
   "applicationId": "com.abtasty.flagshipqa",
-  "variantName": "processReleaseResources",
+  "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
+      "attributes": [],
       "versionCode": 1,
       "versionName": "1.0",
       "outputFile": "app-release.apk"
     }
-  ]
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 21
 }

app/src/main/java/com/abtasty/flagshipqa/MainActivity.kt

@@ -1,25 +1,12 @@
 package com.abtasty.flagshipqa
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.abtasty.flagship.api.CacheStrategy
-import com.abtasty.flagship.api.TrackingManagerConfig
-import com.abtasty.flagship.hits.Screen
-import com.abtasty.flagship.main.Flagship
-import com.abtasty.flagship.main.FlagshipConfig
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 
 class MainActivity : AppCompatActivity() {
 

app/src/main/java/com/abtasty/flagshipqa/ui/dashboard/ConfigViewModel.kt

@@ -77,8 +77,9 @@ class ConfigViewModel(val appContext: Application) : AndroidViewModel(appContext
             error(errorStr)
         else {
             val flagshipConfig = if (useBucketing.value == true) FlagshipConfig.Bucketing() else FlagshipConfig.DecisionApi()
-            if (flagshipConfig is FlagshipConfig.Bucketing)
+            if (flagshipConfig is FlagshipConfig.Bucketing) {
                 flagshipConfig.withPollingIntervals(pollingIntervalTime.value!!, getPollingIntervalUnit())
+            }
             flagshipConfig.withTimeout(timeout.value ?: 2000)
             flagshipConfig.withLogLevel(LogManager.Level.ALL)
             flagshipConfig.withFlagshipStatusListener { status ->
@@ -103,6 +104,7 @@ class ConfigViewModel(val appContext: Application) : AndroidViewModel(appContext
                 TrackingManagerConfig(
                     maxPoolSize = 5,
                     batchTimeInterval = 10000
+//                    disablePolling = true
                 )
             )
             //

app/src/main/java/com/abtasty/flagshipqa/ui/modifications/ModificationViewModel.kt

@@ -6,7 +6,6 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import com.abtasty.flagship.main.Flagship
 import com.abtasty.flagship.model.Flag
-import com.abtasty.flagship.model.Modification
 import com.abtasty.flagship.model._Flag
 import com.abtasty.flagship.visitor.VisitorDelegate
 import org.json.JSONObject

build.gradle

@@ -1,10 +1,5 @@
 buildscript {
 
-    /*
-        ./gradlew publishToSonatype closeSonatypeStagingRepository
-        ./gradlew publishToSonatype -Dvariant=compat  closeSonatypeStagingRepository
-     */
-
     ext {
         kotlin_version = '1.9.25'
         maven_artifact_id = "flagship-android"
@@ -15,32 +10,26 @@ buildscript {
         if (!maven_variant.isEmpty()) {
             maven_artifact_id = maven_artifact_id + '-' + maven_variant
         }
-        flagship_version_name = System.getenv('FLAGSHIP_VERSION_NAME') ?: "4.0.0-beta1"
-        flagship_version_code = System.getenv('FLAGSHIP_VERSION_CODE') ?: 20
-        sonatype_signing_key = System.getenv('SONATYPE_SIGNING_KEY')
-        sonatype_signing_pwd = System.getenv('SONATYPE_SIGNING_PWD')
-        sonatype_username = System.getenv('SONATYPE_USERNAME') ?: ossrhUsername
-        sonatype_password = System.getenv('SONATYPE_PASSWORD') ?: ossrhPassword
-        sonatype_repository_id = System.getenv('SONATYPE_REPOSITORY') ?: stagingRepositoryId
+        flagship_version_name = System.getenv('FLAGSHIP_VERSION_NAME') ?: "4.0.0-beta2"
+        flagship_version_code = System.getenv('FLAGSHIP_VERSION_CODE') ?: 21
     }
 
     repositories {
         google()
         mavenCentral()
-        maven { url 'https://jitpack.io' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.16"
-        classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
+//        classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
     }
 }
 
 plugins {
-    id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
+    id 'com.google.devtools.ksp' version '1.9.25-1.0.20' apply false
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
-    id 'org.jetbrains.kotlin.android' version '1.9.20' apply false
+    id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
 }
 
 allprojects {
@@ -50,19 +39,7 @@ allprojects {
     }
 }
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
-            stagingProfileId = sonatype_repository_id
-            username = sonatype_username
-            password = sonatype_password
-        }
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }
 

codecov.yml

@@ -0,0 +1,6 @@
+codecov:
+  require_ci_to_pass: yes
+
+ignore:
+  - "flagship/src/main/java/com/abtasty/flagship/database"
+  - "**/EAIWindowCallBack.kt"