Skip to content

Commit 2941d95

Browse files
author
github-actions
committed
fix: Android SDK version 36
1 parent a946cc6 commit 2941d95

9 files changed

Lines changed: 44 additions & 12 deletions

File tree

android/build.gradle

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:4.2.2'
11+
classpath 'com.android.tools.build:gradle:8.1.4'
1212
// noinspection DifferentKotlinGradleVersion
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
@@ -50,6 +50,11 @@ def getExtOrIntegerDefault(name) {
5050

5151
android {
5252
compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
53+
namespace 'com.extole.android.sdk'
54+
55+
buildFeatures {
56+
buildConfig true
57+
}
5358

5459
defaultConfig {
5560
minSdkVersion getExtOrIntegerDefault('minSdkVersion')
@@ -67,8 +72,12 @@ android {
6772
}
6873

6974
compileOptions {
70-
sourceCompatibility JavaVersion.VERSION_1_8
71-
targetCompatibility JavaVersion.VERSION_1_8
75+
sourceCompatibility JavaVersion.VERSION_11
76+
targetCompatibility JavaVersion.VERSION_11
77+
}
78+
79+
kotlinOptions {
80+
jvmTarget = '11'
7281
}
7382
}
7483

@@ -148,8 +157,8 @@ dependencies {
148157
//noinspection GradleDynamicVersion
149158
implementation "com.facebook.react:react-native:+"
150159
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
151-
implementation 'com.extole.mobile:android-sdk:1.0.56'
152-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
160+
implementation 'com.extole.mobile:android-sdk:1.0.64'
161+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
153162
// From node_modules
154163
}
155164

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ExtoleMobileSdk_kotlinVersion=1.7.0
1+
ExtoleMobileSdk_kotlinVersion=1.9.0
22
ExtoleMobileSdk_minSdkVersion=21
33
ExtoleMobileSdk_targetSdkVersion=31
44
ExtoleMobileSdk_compileSdkVersion=31
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.extole.android.sdk">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
22

33
</manifest>

example/react-native.config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ module.exports = {
44
dependencies: {
55
'extole-mobile-sdk': {
66
root: path.join(__dirname, '..'),
7+
platforms: {
8+
android: {
9+
sourceDir: path.join(__dirname, '..', 'android'),
10+
packageImportPath: 'import com.extole.android.sdk.ExtoleMobileSdkPackage;',
11+
packageInstance: 'new ExtoleMobileSdkPackage()',
12+
},
13+
},
714
},
815
},
916
};

extole-mobile-sdk.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
1717
s.source_files = "ios/**/*.{h,m,mm,swift}"
1818

1919
s.dependency "React-Core"
20-
s.dependency "ExtoleMobileSDK", '~> 0.0.89'
20+
s.dependency "ExtoleMobileSDK", '~> 0.0.90'
2121

2222
# Don't install the dependencies when we run `pod install` in the old architecture.
2323
if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@extole/react-native-sdk",
3-
"version": "0.0.2",
3+
"version": "0.0.3",
44
"description": "Extole React Native SDK",
55
"main": "lib/commonjs/index",
66
"module": "lib/module/index",

react-native.config.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
const path = require('path');
2+
3+
module.exports = {
4+
dependencies: {
5+
'extole-mobile-sdk': {
6+
root: __dirname,
7+
platforms: {
8+
android: {
9+
sourceDir: path.join(__dirname, 'android'),
10+
packageImportPath: 'import com.extole.android.sdk.ExtoleMobileSdkPackage;',
11+
packageInstance: 'new ExtoleMobileSdkPackage()',
12+
},
13+
},
14+
},
15+
},
16+
};

0 commit comments

Comments
 (0)