Release 1.0.10

Author: Yevhen Podkovyrin

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlinVersion = '1.9.21'
 
-        sdk_version = '1.0.9'
+        sdk_version = '1.0.10'
         groupId = 'com.flexa'
         core_version = sdk_version
         scan_version = sdk_version
@@ -32,17 +32,17 @@ buildscript {
         navigation = '2.5.2'
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 plugins {
-    id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
+    id 'com.android.application' version '8.7.3' apply false
+    id 'com.android.library' version '8.7.3' apply false
     id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
     id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinVersion" apply false
 }
 
 task clean(type: Delete) {
-    delete rootProject.buildDir
+    delete layout.buildDirectory.asFile.get()
 }

core/build.gradle

@@ -4,9 +4,9 @@ plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
-    id 'maven-publish'
     id 'org.jetbrains.kotlin.plugin.serialization'
     id 'kotlin-kapt'
+    id 'maven-publish'
 }
 
 android {
@@ -30,7 +30,7 @@ android {
             it.buildConfigField 'String', 'DEBUG_API_HOST', 'null'
         }
         debug {
-            it.buildConfigField 'String', 'DEBUG_API_HOST', "\"${localProperties['debug.api.host']?:""}\""
+            it.buildConfigField 'String', 'DEBUG_API_HOST', "\"${localProperties['debug.api.host'] ?: ""}\""
         }
     }
     def date = new SimpleDateFormat("yyyy-MM-dd").format(new Date())
@@ -47,17 +47,11 @@ android {
     }
     buildFeatures {
         compose true
+        buildConfig true
     }
     composeOptions {
         kotlinCompilerExtensionVersion kotlin_compiler_version
     }
-    sourceSets {
-        main {
-            kotlin {
-                srcDir("$buildDir/generated/api")
-            }
-        }
-    }
     gradle.taskGraph.whenReady {
         def task = it.getAllTasks().find { t -> t.name.contains('bundle') }
         if (task && task.name && (
@@ -105,7 +99,6 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
 
-
     /*AppCompat*/
     implementation 'androidx.appcompat:appcompat:1.7.0'
 
@@ -138,6 +131,8 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.13'
 }
 
+def module_description = 'The core module is required by all other modules in the Flexa SDK. The Flexa SDK is a suite of prebuilt functionality that enables your wallet app to interface directly with Flexa-powered payment systems in-person and online'
+
 project.afterEvaluate {
     publishing {
         publications {
@@ -174,18 +169,5 @@ project.afterEvaluate {
                 }
             }
         }
-        repositories {
-            maven {
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/flexa/flexa-android")
-                credentials {
-                    def propertiesFile = rootProject.file("local.properties")
-                    def localProperties = new Properties()
-                    localProperties.load(new FileInputStream(propertiesFile))
-                    username = localProperties['gpr.user'] ?: ""
-                    password = localProperties['gpr.key'] ?: ""
-                }
-            }
-        }
     }
 }

core/build_type.properties

@@ -1,2 +1,2 @@
-#Tue Dec 03 19:05:36 EET 2024
+#Mon Jan 27 16:12:24 EET 2025
 BUILD_TYPE=debug

core/src/main/java/com/flexa/core/data/data/AppInfoProvider.kt

@@ -43,6 +43,28 @@ internal class AppInfoProvider {
                 "Inaccessible"
             }
 
+        fun getAppBuildNumber(application: Context): String =
+            try {
+                val packageInfo = when {
+                    Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ->
+                        application.packageManager
+                            .getPackageInfo(application.packageName, 0)
+
+                    else -> application.packageManager
+                        .getPackageInfo(
+                            application.packageName,
+                            PackageManager.PackageInfoFlags.of(0)
+                        )
+                }
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                    packageInfo.longVersionCode.toString()
+                } else {
+                    packageInfo.versionCode.toString()
+                }
+            } catch (e: Exception) {
+                "Inaccessible"
+            }
+
         fun getAppPackageName(context: Context): String =
             try {
                 val packageInfo = when {

core/src/main/java/com/flexa/core/data/rest/FlexaInterceptor.kt

@@ -20,14 +20,14 @@ internal abstract class FlexaInterceptor: Interceptor {
             Flexa.context?.run { AppInfoProvider.getAppName(this) } ?: "Inaccessible"
         val appVersion =
             Flexa.context?.run { AppInfoProvider.getAppVersion(this) } ?: "Inaccessible"
+        val appBuildNumber =
+            Flexa.context?.run { AppInfoProvider.getAppBuildNumber(this) } ?: "Inaccessible"
         val appPackageName =
             Flexa.context?.run { AppInfoProvider.getAppPackageName(this) } ?: "Inaccessible"
-        val deviceModel = Build.MODEL
-        val deviceManufacturer = Build.MANUFACTURER
-        val userAgent =
-            "$deviceManufacturer $deviceModel/${Build.VERSION.SDK_INT}(${Build.VERSION.RELEASE}) " +
+        val sdkVersion = "${Build.VERSION.RELEASE} (${Build.VERSION.SDK_INT})"
+        val userAgent = "Android/$sdkVersion " +
                     "Spend/${BuildConfig.SPEND_SDK_VERSION} " +
-                    "$appPackageName/$appVersion"
+                    "$appPackageName/$appVersion ($appBuildNumber)"
         HeadersBundle(
             appName = appName,
             version = releaseDate,

core/src/main/java/com/flexa/core/data/rest/RestRepository.kt

@@ -1,5 +1,6 @@
 package com.flexa.core.data.rest
 
+import android.os.Build
 import android.util.Log
 import com.flexa.BuildConfig
 import com.flexa.core.data.storage.SecuredPreferences
@@ -81,7 +82,7 @@ internal class RestRepository(
                     preferences.getStringSynchronously(FlexaConstants.UNIQUE_IDENTIFIER) ?: ""
                 put("challenge", challenge)
                 put("device_id", deviceId)
-                put("device_model", "Android")
+                put("device_model", "${Build.MANUFACTURER} ${Build.MODEL}")
                 put("email", email)
             }.run { toString().toRequestBody(mediaType) }
 

example/build.gradle

@@ -53,6 +53,7 @@ android {
     }
     buildFeatures {
         compose true
+        buildConfig true
     }
     composeOptions {
         kotlinCompilerExtensionVersion kotlin_compiler_version

gradle.properties

@@ -22,4 +22,3 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 org.gradle.unsafe.configuration-cache=false
-android.defaults.buildfeatures.buildconfig=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Sep 24 10:55:24 EEST 2024
+#Fri Jan 24 22:52:02 EET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scan/build.gradle

@@ -126,37 +126,6 @@ project.afterEvaluate {
                     }
                 }
             }
-            bar(MavenPublication) {
-                groupId rootProject.groupId
-                artifactId artifactName
-                version rootProject.core_version
-                def propertiesFile = file('build_type.properties')
-                if (!propertiesFile.canRead()) {
-                    throw new FileNotFoundException("Could not read " + propertiesFile.name)
-                }
-                Properties properties = new Properties()
-                properties.load(new FileInputStream(propertiesFile))
-                def type = properties['BUILD_TYPE']
-                println '<<<--- Building library --->>> ' + type
-                artifact "$buildDir/outputs/aar/${artifactName}-${type}.aar"
-                pom.withXml {
-                    def dependenciesNode = asNode().appendNode("dependencies")
-                    configurations.each {
-                        if (it.name == 'api' || it.name == 'implementation') {
-                            configurations[it.name].allDependencies.forEach {
-                                if (it.group != null && (it.name != null || "unspecified" == it.name)
-                                        && it.version != null && "unspecified" != it.version) {
-                                    println 'dep -->>> ' + it.group + ':' + it.name + ':' + it.version
-                                    def dependencyNode = dependenciesNode.appendNode("dependency")
-                                    dependencyNode.appendNode("groupId", it.group)
-                                    dependencyNode.appendNode("artifactId", it.name)
-                                    dependencyNode.appendNode("version", it.version)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
         }
         repositories {
             maven {