Skip to content

Commit 5ac3a6c

Browse files
authored
Android SDK Support for 16Kb page size
1 parent db697f0 commit 5ac3a6c

7 files changed

Lines changed: 35 additions & 27 deletions

File tree

app/build.gradle

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ detekt {
2121

2222
android {
2323
namespace "com.extole"
24-
compileSdkVersion 35
24+
compileSdkVersion 36
2525

2626
defaultConfig {
2727
applicationId "com.extole"
2828
minSdkVersion 21
29-
targetSdkVersion 35
29+
targetSdkVersion 36
3030
versionCode 15
3131
versionName "1.0.4"
3232

@@ -60,29 +60,28 @@ android {
6060
dependencies {
6161

6262
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
63-
implementation 'androidx.core:core-ktx:1.6.0'
64-
implementation 'androidx.appcompat:appcompat:1.3.1'
65-
implementation 'com.google.android.material:material:1.4.0'
66-
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
67-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
63+
implementation 'androidx.core:core-ktx:1.15.0'
64+
implementation 'androidx.appcompat:appcompat:1.7.0'
65+
implementation 'com.google.android.material:material:1.12.0'
66+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
67+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
6868
implementation 'com.squareup.picasso:picasso:2.71828'
6969
implementation(project(':mobile-sdk'))
7070
detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1"
7171

7272
implementation 'io.branch.sdk.android:library:5.15.0'
7373
implementation 'com.google.android.gms:play-services-ads-identifier:16+'
74-
implementation 'androidx.browser:browser:1.0.0'
74+
implementation 'androidx.browser:browser:1.9.0'
7575

7676
testImplementation 'junit:junit:4.13.2'
77-
androidTestUtil 'androidx.test:orchestrator:1.4.1'
78-
androidTestImplementation 'com.google.code.gson:gson:2.9.0'
79-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
80-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
81-
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
82-
androidTestImplementation 'androidx.test:runner:1.4.0'
83-
androidTestImplementation 'androidx.test:rules:1.4.0'
84-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
85-
androidTestImplementation 'androidx.test.espresso:espresso-web:3.4.0'
77+
androidTestUtil 'androidx.test:orchestrator:1.4.2'
78+
androidTestImplementation 'com.google.code.gson:gson:2.10.1'
79+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
80+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
81+
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0'
82+
androidTestImplementation 'androidx.test:runner:1.6.2'
83+
androidTestImplementation 'androidx.test:rules:1.6.1'
84+
androidTestImplementation 'androidx.test.espresso:espresso-web:3.6.1'
8685
androidTestImplementation 'org.assertj:assertj-core:3.18.1'
8786
androidTestImplementation 'org.awaitility:awaitility:3.1.6'
8887
androidTestImplementation 'org.apache.commons:commons-lang3:3.12.0'

app/src/androidTest/java/com/extole/blackbox/sdk/UIInteractionTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class UIInteractionTests {
214214
emailInput.waitForExists(WAIT_FOR_ELEMENT_TIMEOUT)
215215
emailInput.click()
216216
emailInput.clearTextField()
217-
emailInput.text = BlackboxNameGenerator().getEmailAddress()
217+
emailInput.setText(BlackboxNameGenerator().getEmailAddress())
218218

219219
val anotherElement =
220220
uiDevice.findObject(UiSelector().textStartsWith("Enter"))

app/src/main/java/com/extole/mobile/DeeplinkActivity.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ class DeeplinkActivity : AppCompatActivity() {
3333
intent.putExtra("branch_force_new_session", true)
3434
}
3535

36-
override fun onNewIntent(intent: Intent?) {
36+
override fun onNewIntent(intent: Intent) {
3737
super.onNewIntent(intent)
3838
setIntent(intent)
39-
if (intent != null &&
40-
intent.hasExtra("branch_force_new_session") &&
41-
intent.getBooleanExtra("branch_force_new_session", true)
39+
if (intent.hasExtra("branch_force_new_session") && intent.getBooleanExtra(
40+
"branch_force_new_session",
41+
true
42+
)
4243
) {
4344
Branch.sessionBuilder(this).withCallback(branchReferralInitListener).reInit()
4445
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
maven { url "https://plugins.gradle.org/m2/" }
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.12.0'
11+
classpath 'com.android.tools.build:gradle:8.13.2'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
classpath("org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}")
1414
// NOTE: Do not place your application dependencies here; they belong

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ android.useAndroidX=true
1919
kotlin.code.style=official
2020
android.enableJetifier=true
2121
# Gradle 8.x compatibility settings
22-
org.gradle.parallel=true
22+
org.gradle.parallel=true
23+
# Enable 16KB page size support for Android devices
24+
android.experimental.enable16KbPageSize=true

mobile-sdk/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ dependencies {
5656

5757
detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1"
5858
dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20")
59-
//noinspection GradleDependency
60-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
61-
implementation 'com.google.code.gson:gson:2.9.0'
59+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
60+
implementation 'com.google.code.gson:gson:2.10.1'
6261
implementation 'org.greenrobot:eventbus:3.3.1'
6362

6463
api 'com.orhanobut:logger:2.2.0'

mobile-sdk/settings.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pluginManagement {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
gradlePluginPortal()
6+
}
7+
}

0 commit comments

Comments
 (0)