Skip to content

Commit 4fc268f

Browse files
committed
[PR-24286] Upgrade app
1 parent 73cc2dd commit 4fc268f

File tree

10 files changed

+260
-158
lines changed

10 files changed

+260
-158
lines changed

app/build.gradle

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

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

76
android {
7+
namespace 'com.talkable.demo'
88
signingConfigs {
99
config {
1010
keyAlias keystoreProperties['keyAlias']
@@ -13,11 +13,11 @@ android {
1313
storePassword keystoreProperties['storePassword']
1414
}
1515
}
16-
compileSdkVersion 31
16+
compileSdkVersion 34
1717
defaultConfig {
1818
applicationId "com.talkable.demo"
19-
minSdkVersion 16
20-
targetSdkVersion 31
19+
minSdkVersion 19
20+
targetSdkVersion 34
2121
versionCode 34
2222
versionName "0.5.3"
2323
}
@@ -32,12 +32,13 @@ android {
3232
sourceCompatibility JavaVersion.VERSION_1_8
3333
targetCompatibility JavaVersion.VERSION_1_8
3434
}
35+
buildToolsVersion '36.0.0'
3536
}
3637

3738
dependencies {
3839
implementation fileTree(include: ['*.jar'], dir: 'libs')
3940
implementation project(path: ':sdk')
4041
implementation 'com.google.android.material:material:1.0.0'
41-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
42-
testImplementation 'junit:junit:4.12'
42+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
43+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
4344
}
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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
// Required for sdk version retrieval to work as of Android Studio 4.1.0: https://issuetracker.google.com/issues/158695880
5+
project.ext.set("sdk_version_code", 42)
6+
project.ext.set("sdk_version_name", "0.5.13")
7+
48
repositories {
59
mavenCentral()
610
google()
711
}
812
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.6.4'
13+
classpath 'com.android.tools.build:gradle:8.1.4'
1014
classpath 'com.github.bjoernq:unmockplugin:0.7.6'
11-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
15+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1216

1317
// NOTE: Do not place your application dependencies here; they belong
1418
// in the individual module build.gradle files

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19+
android.defaults.buildfeatures.buildconfig=true
1920
android.enableJetifier=true
21+
android.nonFinalResIds=false
22+
android.nonTransitiveRClass=false
2023
android.useAndroidX=true

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-6.3-all.zip

0 commit comments

Comments
 (0)