Skip to content

Upgrade React Native and update Android build configs #4

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
mCodex merged 1 commit into from
Aug 14, 2025
Merged

Upgrade React Native and update Android build configs #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions example/android/app/src/main/java/plugpagnitro/example/MainApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ import com.facebook.react.ReactApplication
import com.facebook.react.ReactHost
import com.facebook.react.ReactNativeHost
import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.react.soloader.OpenSourceMergedSoMapping
import com.facebook.soloader.SoLoader

class MainApplication : Application(), ReactApplication {

Expand All @@ -35,10 +33,7 @@ class MainApplication : Application(), ReactApplication {

override fun onCreate() {
super.onCreate()
SoLoader.init(this, OpenSourceMergedSoMapping)
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}

loadReactNative(this)
}
}
8 changes: 4 additions & 4 deletions example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
ext {
buildToolsVersion = "35.0.0"
buildToolsVersion = "36.0.0"
minSdkVersion = 24
compileSdkVersion = 35
targetSdkVersion = 35
compileSdkVersion = 36
targetSdkVersion = 36
ndkVersion = "27.1.12297006"
kotlinVersion = "2.0.21"
kotlinVersion = "2.1.20"
}
repositories {
google()
Expand Down
5 changes: 5 additions & 0 deletions example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@ newArchEnabled=true
# Use this property to enable or disable the Hermes JS engine.
# If set to false, you will be using JSC instead.
hermesEnabled=true

# Use this property to enable edge-to-edge display support.
# This allows your app to draw behind system bars for an immersive UI.
# Note: Only works with ReactActivity and should not be used with custom Activity.
edgeToEdgeEnabled=true
Binary file modified example/android/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions example/android/gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH="\\\"\\\""
Copy link

Copilot AI Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CLASSPATH is set to an empty quoted string which will likely cause Gradle execution to fail. This should either be removed entirely or set to a proper value.

Suggested change
CLASSPATH="\\\"\\\""

Copilot uses AI. Check for mistakes.


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

# Stop when "xargs" is not available.
Expand Down
9 changes: 7 additions & 2 deletions example/android/gradlew.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
@REM Copyright (c) Meta Platforms, Inc. and affiliates.
@REM
@REM This source code is licensed under the MIT license found in the
@REM LICENSE file in the root directory of this source tree.

@rem
@rem Copyright 2015 the original author or authors.
@rem
Expand Down Expand Up @@ -70,11 +75,11 @@ goto fail
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
set CLASSPATH=


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
Copy link

Copilot AI Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting CLASSPATH to empty may cause issues with Gradle execution. This change should be verified to ensure it works correctly with the new jar-based execution pattern.

Copilot uses AI. Check for mistakes.

:end
@rem End local scope for the variables with windows NT shell
Expand Down
22 changes: 11 additions & 11 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@
"build:ios": "react-native build-ios --mode Debug"
},
"dependencies": {
"react": "19.0.0",
"react-native": "0.79.x",
"react-native-nitro-modules": "^0.26.4"
"react": "19.1.0",
"react-native": "^0.81.0",
"react-native-nitro-modules": "^0.27.6"
},
"devDependencies": {
"@babel/core": "^7.28.0",
"@babel/preset-env": "^7.28.0",
"@babel/runtime": "^7.27.6",
"@react-native-community/cli": "19.1.0",
"@react-native-community/cli-platform-android": "18.0.0",
"@react-native-community/cli-platform-ios": "18.0.0",
"@react-native/babel-preset": "0.79.x",
"@react-native/metro-config": "0.79.x",
"@react-native/typescript-config": "0.80.1",
"@types/react": "^19.1.8",
"@babel/runtime": "^7.28.2",
"@react-native-community/cli": "20.0.0",
"@react-native-community/cli-platform-android": "20.0.0",
"@react-native-community/cli-platform-ios": "20.0.0",
"@react-native/babel-preset": "^0.81.0",
"@react-native/metro-config": "^0.81.0",
"@react-native/typescript-config": "0.81.0",
"@types/react": "^19.1.10",
"react-native-builder-bob": "^0.40.13",
"react-native-monorepo-config": "^0.1.9"
},
Expand Down
10 changes: 5 additions & 5 deletions lefthook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ pre-commit:
types:
glob: "*.{js,ts, jsx, tsx}"
run: npx tsc
commit-msg:
parallel: true
commands:
commitlint:
run: npx commitlint --edit
# commit-msg:
# parallel: true
# commands:
# commitlint:
# run: npx commitlint --edit
26 changes: 13 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,30 +71,30 @@
},
"devDependencies": {
"@commitlint/config-conventional": "^19.8.1",
"@eslint/compat": "^1.3.1",
"@eslint/compat": "^1.3.2",
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.31.0",
"@evilmartians/lefthook": "^1.12.2",
"@react-native/babel-preset": "0.80.1",
"@react-native/eslint-config": "^0.80.1",
"@eslint/js": "^9.33.0",
"@evilmartians/lefthook": "^1.12.3",
"@react-native/babel-preset": "0.81.0",
"@react-native/eslint-config": "^0.81.0",
"@release-it/conventional-changelog": "^10.0.1",
"@types/jest": "^30.0.0",
"@types/react": "^19.1.8",
"@types/react": "^19.1.10",
"commitlint": "^19.8.1",
"del-cli": "^6.0.0",
"eslint": "^9.31.0",
"eslint": "^9.33.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.3",
"eslint-plugin-prettier": "^5.5.4",
"jest": "^30.0.5",
"nitro-codegen": "^0.26.4",
"nitro-codegen": "^0.27.6",
"prettier": "^3.6.2",
"react": "19.1.0",
"react-native": "0.80.1",
"react": "19.1.1",
"react-native": "0.81.0",
"react-native-builder-bob": "^0.40.13",
"react-native-nitro-modules": "^0.26.4",
"react-native-nitro-modules": "^0.27.6",
"release-it": "^19.0.4",
"turbo": "^2.5.5",
"typescript": "^5.8.3"
"typescript": "^5.9.2"
},
"peerDependencies": {
"react": "*",
Expand Down
Loading
Loading