Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PBI-7134 Support android 34 - solution 1 #263

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

PBI-7134 Support android 34 - solution 1 #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2a4b33
Merge pull request #260 from apptentive/develop
frankus Jun 26, 2024
7c6da40
Merge branch 'develop' into PBI-7134-support-android-34
Aug 12, 2024
448aef2
6.8.1, rn version 0.73 and target 33 in the plugin
Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:7.1.3"
classpath "com.android.tools.build:gradle:7.2.2"
// noinspection DifferentKotlinGradleVersion
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand All @@ -35,6 +35,7 @@ def getExtOrIntegerDefault(name) {

android {
compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
namespace 'com.apptentive.android.sdk.reactlibrary'

defaultConfig {
minSdkVersion getExtOrIntegerDefault("minSdkVersion")
Expand All @@ -61,6 +62,7 @@ android {
repositories {
mavenCentral()
google()
jcenter()
}

def kotlin_version = getExtOrDefault("kotlinVersion")
Expand All @@ -73,7 +75,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

// Apptentive
implementation 'com.apptentive:apptentive-kit-android:6.8.0'
implementation 'com.apptentive:apptentive-kit-android:6.8.1'
}

if (isNewArchitectureEnabled()) {
Expand Down
4 changes: 2 additions & 2 deletions android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Apptentive_kotlinVersion=1.7.20
Apptentive_minSdkVersion=21
Apptentive_compileSdkVersion=31
Apptentive_targetSdkVersion=31
Apptentive_compileSdkVersion=33
Apptentive_targetSdkVersion=33

android.useAndroidX=true
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 1 addition & 2 deletions android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.apptentive.android.sdk.reactlibrary">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
2 changes: 1 addition & 1 deletion example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.1.3")
classpath("com.android.tools.build:gradle:7.2.2")
classpath("com.facebook.react:react-native-gradle-plugin")
}
}
1 change: 1 addition & 0 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"jest": "^29.2.1",
"metro-react-native-babel-preset": "0.73.7",
"prettier": "^2.4.1",
"react-native-gradle-plugin": "^0.71.19",
"react-test-renderer": "18.2.0",
"typescript": "4.8.4"
},
Expand Down
3,020 changes: 1,527 additions & 1,493 deletions example/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "apptentive-react-native",
"version": "6.8.0",
"version": "6.8.1",
"description": "React Native Module for Apptentive SDK",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down Expand Up @@ -72,8 +72,8 @@
"jest": "^26.0.1",
"pod-install": "^0.1.0",
"prettier": "^2.0.5",
"react": "16.13.1",
"react-native": "0.64.1",
"react": "^18.2.0",
"react-native": "^0.73.0",
"react-native-builder-bob": "^0.18.2",
"release-it": "^14.2.2",
"typescript": "^4.1.3"
Expand Down
Loading