Skip to content

feat(android): upgrade SDK versions and build tools #742

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

Merged
merged 4 commits into from
Jan 28, 2025
Merged

feat(android): upgrade SDK versions and build tools #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b84c494
feat(android): upgrade SDK versions and build tools
szymonrybczak Dec 30, 2024
9c19b77
feat: update values in `build.gradle`
szymonrybczak Dec 30, 2024
696bd0b
fix: get Gradle version dynamically
szymonrybczak Dec 30, 2024
d9d47bd
fix: self code review
szymonrybczak Dec 30, 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
13 changes: 5 additions & 8 deletions packages/create-react-native-library/templates/native-common/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
buildscript {
// Buildscript is evaluated before everything else so we can't use getExtOrDefault
def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["<%- project.name -%>_kotlinVersion"]
ext.getExtOrDefault = {name ->
return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['<%- project.name -%>_' + name]
}

repositories {
google()
mavenCentral()
}

dependencies {
classpath "com.android.tools.build:gradle:7.2.1"
classpath "com.android.tools.build:gradle:8.7.2"
// noinspection DifferentKotlinGradleVersion
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
}
}

Expand All @@ -32,10 +33,6 @@ if (isNewArchitectureEnabled()) {
apply plugin: "com.facebook.react"
}

def getExtOrDefault(name) {
return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["<%- project.name -%>_" + name]
}

def getExtOrIntegerDefault(name) {
return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["<%- project.name -%>_" + name]).toInteger()
}
Expand Down
10 changes: 5 additions & 5 deletions packages/create-react-native-library/templates/native-common/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%- project.name -%>_kotlinVersion=1.7.0
<%- project.name -%>_minSdkVersion=21
<%- project.name -%>_targetSdkVersion=31
<%- project.name -%>_compileSdkVersion=31
<%- project.name -%>_ndkversion=21.4.7075529
<%- project.name -%>_kotlinVersion=2.0.21
<%- project.name -%>_minSdkVersion=24
<%- project.name -%>_targetSdkVersion=34
<%- project.name -%>_compileSdkVersion=35
<%- project.name -%>_ndkversion=27.1.12297006
Loading