[PR-24612] Upgrade App

.circleci/config.yml

@@ -5,9 +5,8 @@ jobs:
       - auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_ACCESS_TOKEN
-        image: cimg/android:2023.04
+        image: cimg/android:2024.01.1
         environment:
-          JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
           JVM_OPTS: -Xmx3200m
 
     steps:

app/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.application'
 
-
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(rootProject.file("keystore.properties")))
 
 android {
+    namespace 'com.talkable.appdemo'
     signingConfigs {
         config {
             keyAlias keystoreProperties['keyAlias']
@@ -13,13 +13,13 @@ android {
             storePassword keystoreProperties['storePassword']
         }
     }
-    compileSdkVersion 31
+    compileSdkVersion 35
     defaultConfig {
-        applicationId "com.talkable.demo"
-        minSdkVersion 16
-        targetSdkVersion 31
-        versionCode 34
-        versionName "0.5.3"
+        applicationId "com.talkable.appdemo"
+        minSdkVersion 21
+        targetSdkVersion 35
+        versionCode 35
+        versionName "0.5.4"
     }
     buildTypes {
         release {
@@ -32,12 +32,13 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    buildToolsVersion '36.0.0'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(path: ':sdk')
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }

app/src/androidTest/java/com/talkable/appdemo/ApplicationTest.java

@@ -0,0 +1,19 @@
+package com.talkable.appdemo;
+
+import android.app.Application;
+import androidx.test.core.app.ApplicationProvider;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ * <a href="https://developer.android.com/studio/test">Testing Fundamentals</a>
+ */
+
+public class ApplicationTest {
+    @Test
+    public void testApplication() {
+        // Getting the application context using AndroidX ApplicationProvider
+        Application app = ApplicationProvider.getApplicationContext();
+        assertNotNull(app);  // Assert that the Application context is not null
+    }
+}

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.talkable.demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -13,7 +12,7 @@
         android:theme="@style/AppTheme"
         android:name=".DemoApp">
         <activity
-            android:name="com.talkable.demo.MainActivity"
+            android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:exported="true">
             <intent-filter>

app/src/main/java/com/talkable/demo/DemoApp.java → app/src/main/java/com/talkable/appdemo/DemoApp.java

@@ -1,4 +1,4 @@
-package com.talkable.demo;
+package com.talkable.appdemo;
 
 import android.app.Application;
 

app/src/main/java/com/talkable/demo/MainActivity.java → app/src/main/java/com/talkable/appdemo/MainActivity.java

@@ -1,4 +1,4 @@
-package com.talkable.demo;
+package com.talkable.appdemo;
 
 import android.app.Activity;
 import android.os.Bundle;

app/src/main/java/com/talkable/demo/OverridenTalkableOfferFragment.java → app/src/main/java/com/talkable/appdemo/OverridenTalkableOfferFragment.java

@@ -1,4 +1,4 @@
-package com.talkable.demo;
+package com.talkable.appdemo;
 
 
 import android.widget.Toast;

app/src/main/res/layout/activity_main.xml

@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.talkable.demo.MainActivity">
+    tools:context="com.talkable.appdemo.MainActivity">
 
     <ScrollView
         android:layout_width="fill_parent"

app/src/test/java/com/talkable/demo/ExampleUnitTest.java → app/src/test/java/com/talkable/appdemo/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.talkable.demo;
+package com.talkable.appdemo;
 
 import org.junit.Test;
 

build.gradle

@@ -6,10 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
-        classpath 'com.github.bjoernq:unmockplugin:0.7.6'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-
+        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.github.bjoernq:unmockplugin:0.7.8'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

gradle.properties

@@ -16,5 +16,10 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
+sdk_version_code=42
+sdk_version_name=0.5.13

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Wed Jun 19 22:47:32 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip