Skip to content

Commit fa7ab2c

Browse files
committed
[PR-24286] Upgrade app
1 parent 5b4483e commit fa7ab2c

8 files changed

Lines changed: 243 additions & 155 deletions

File tree

app/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22

3-
43
def keystoreProperties = new Properties()
54
keystoreProperties.load(new FileInputStream(rootProject.file("keystore.properties")))
65

@@ -14,11 +13,11 @@ android {
1413
storePassword keystoreProperties['storePassword']
1514
}
1615
}
17-
compileSdkVersion 31
16+
compileSdkVersion 34
1817
defaultConfig {
1918
applicationId "com.talkable.demo"
20-
minSdkVersion 16
21-
targetSdkVersion 31
19+
minSdkVersion 19
20+
targetSdkVersion 34
2221
versionCode 34
2322
versionName "0.5.3"
2423
}
@@ -40,6 +39,6 @@ dependencies {
4039
implementation fileTree(include: ['*.jar'], dir: 'libs')
4140
implementation project(path: ':sdk')
4241
implementation 'com.google.android.material:material:1.0.0'
43-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
44-
testImplementation 'junit:junit:4.12'
42+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
43+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
4544
}
Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
package com.talkable.demo;
22

33
import android.app.Application;
4-
import android.test.ApplicationTestCase;
4+
import androidx.test.core.app.ApplicationProvider;
5+
import org.junit.Test;
6+
import static org.junit.Assert.*;
57

68
/**
7-
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
9+
* <a href="https://developer.android.com/studio/test">Testing Fundamentals</a>
810
*/
9-
public class ApplicationTest extends ApplicationTestCase<Application> {
10-
public ApplicationTest() {
11-
super(Application.class);
11+
12+
public class ApplicationTest {
13+
@Test
14+
public void testApplication() {
15+
// Getting the application context using AndroidX ApplicationProvider
16+
Application app = ApplicationProvider.getApplicationContext();
17+
assertNotNull(app); // Assert that the Application context is not null
1218
}
1319
}

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
//Required for our library version retrieval to work as of Android Studio 4.1.0: https://issuetracker.google.com/issues/158695880
4+
// Required for sdk version retrieval to work as of Android Studio 4.1.0: https://issuetracker.google.com/issues/158695880
55
project.ext.set("sdk_version_code", 42)
66
project.ext.set("sdk_version_name", "0.5.13")
77

@@ -10,7 +10,7 @@ buildscript {
1010
google()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:8.0.0'
13+
classpath 'com.android.tools.build:gradle:8.1.4'
1414
classpath 'com.github.bjoernq:unmockplugin:0.7.6'
1515
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1616

gradle/wrapper/gradle-wrapper.jar

-10.7 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Jun 19 22:47:32 EEST 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

0 commit comments

Comments
 (0)