Skip to content

Commit 482c28b

Browse files
authored
Merge branch 'main' into patch-1
2 parents b97a740 + f06514d commit 482c28b

File tree

11 files changed

+48
-32
lines changed

11 files changed

+48
-32
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18
1+
v20

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"packageManager": "[email protected]",
1414
"engines": {
15-
"node": ">= 18.0.0"
15+
"node": ">= 20.0.0"
1616
},
1717
"scripts": {
1818
"lint": "eslint \"**/*.{js,ts,tsx}\"",

packages/create-react-native-library/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [0.47.0](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.47.0) (2025-01-28)
7+
8+
### Bug Fixes
9+
10+
* build architectures needed only for cpp projects ([#753](https://github.com/callstack/react-native-builder-bob/issues/753)) ([9509158](https://github.com/callstack/react-native-builder-bob/commit/95091588167d0d4ffd04363030945c654ec60d30)) - by @okwasniewski
11+
* codegen generated headers are public on ios ([#737](https://github.com/callstack/react-native-builder-bob/issues/737)) ([5a68aa7](https://github.com/callstack/react-native-builder-bob/commit/5a68aa7507254704b762f01475d5306ddf2aaec6)), closes [#690](https://github.com/callstack/react-native-builder-bob/issues/690) - by @atlj
12+
13+
### Features
14+
15+
* **android:** upgrade SDK versions and build tools ([#742](https://github.com/callstack/react-native-builder-bob/issues/742)) ([388ad09](https://github.com/callstack/react-native-builder-bob/commit/388ad09ed748fc00c278ade6402fb7e62fa2be64)) - by @szymonrybczak
16+
* update gh actions in template from `v3` to `v4` ([#748](https://github.com/callstack/react-native-builder-bob/issues/748)) ([64a469c](https://github.com/callstack/react-native-builder-bob/commit/64a469c55b3944284d8caa505a8b5e3f3e3a8bfe)) - by @krozniata
17+
618
# [0.46.0](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.46.0) (2025-01-28)
719

820
### Bug Fixes

packages/create-react-native-library/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-react-native-library",
3-
"version": "0.46.0",
3+
"version": "0.47.0",
44
"description": "CLI to scaffold React Native libraries",
55
"keywords": [
66
"react-native",
@@ -30,7 +30,7 @@
3030
"templates"
3131
],
3232
"engines": {
33-
"node": ">= 18.0.0"
33+
"node": ">= 20.0.0"
3434
},
3535
"publishConfig": {
3636
"access": "public",

packages/create-react-native-library/templates/common/$.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
using: composite
66
steps:
77
- name: Setup Node.js
8-
uses: actions/setup-node@v3
8+
uses: actions/setup-node@v4
99
with:
1010
node-version-file: .nvmrc
1111

packages/create-react-native-library/templates/common/$.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Setup
2121
uses: ./.github/actions/setup
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434

3535
- name: Setup
3636
uses: ./.github/actions/setup
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343
steps:
4444
- name: Checkout
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646

4747
- name: Setup
4848
uses: ./.github/actions/setup
@@ -57,7 +57,7 @@ jobs:
5757
TURBO_CACHE_DIR: .turbo/android
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v3
60+
uses: actions/checkout@v4
6161

6262
- name: Setup
6363
uses: ./.github/actions/setup
@@ -80,7 +80,7 @@ jobs:
8080
8181
- name: Install JDK
8282
if: env.turbo_cache_hit != 1
83-
uses: actions/setup-java@v3
83+
uses: actions/setup-java@v4
8484
with:
8585
distribution: 'zulu'
8686
java-version: '17'
@@ -113,7 +113,7 @@ jobs:
113113
TURBO_CACHE_DIR: .turbo/ios
114114
steps:
115115
- name: Checkout
116-
uses: actions/checkout@v3
116+
uses: actions/checkout@v4
117117

118118
- name: Setup
119119
uses: ./.github/actions/setup
@@ -169,7 +169,7 @@ jobs:
169169
runs-on: ubuntu-latest
170170
steps:
171171
- name: Checkout
172-
uses: actions/checkout@v3
172+
uses: actions/checkout@v4
173173

174174
- name: Setup
175175
uses: ./.github/actions/setup
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18
1+
v20

packages/create-react-native-library/templates/native-common/android/build.gradle

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
buildscript {
2-
// Buildscript is evaluated before everything else so we can't use getExtOrDefault
3-
def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["<%- project.name -%>_kotlinVersion"]
2+
ext.getExtOrDefault = {name ->
3+
return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['<%- project.name -%>_' + name]
4+
}
45

56
repositories {
67
google()
78
mavenCentral()
89
}
910

1011
dependencies {
11-
classpath "com.android.tools.build:gradle:7.2.1"
12+
classpath "com.android.tools.build:gradle:8.7.2"
1213
// noinspection DifferentKotlinGradleVersion
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
1415
}
1516
}
1617

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

35-
def getExtOrDefault(name) {
36-
return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["<%- project.name -%>_" + name]
37-
}
38-
3936
def getExtOrIntegerDefault(name) {
4037
return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["<%- project.name -%>_" + name]).toInteger()
4138
}
@@ -133,10 +130,7 @@ repositories {
133130
def kotlin_version = getExtOrDefault("kotlinVersion")
134131

135132
dependencies {
136-
// For < 0.71, this will be from the local maven repo
137-
// For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
138-
//noinspection GradleDynamicVersion
139-
implementation "com.facebook.react:react-native:+"
133+
implementation "com.facebook.react:react-android"
140134
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
141135
}
142136

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<%- project.name -%>_kotlinVersion=1.7.0
2-
<%- project.name -%>_minSdkVersion=21
3-
<%- project.name -%>_targetSdkVersion=31
4-
<%- project.name -%>_compileSdkVersion=31
5-
<%- project.name -%>_ndkVersion=21.4.7075529
1+
<%- project.name -%>_kotlinVersion=2.0.21
2+
<%- project.name -%>_minSdkVersion=24
3+
<%- project.name -%>_targetSdkVersion=34
4+
<%- project.name -%>_compileSdkVersion=35
5+
<%- project.name -%>_ndkVersion=27.1.12297006

packages/react-native-builder-bob/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [0.36.0](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.36.0) (2025-01-28)
7+
8+
### Bug Fixes
9+
10+
* bob codegen deletes view specs when codegen type is all ([#736](https://github.com/callstack/react-native-builder-bob/issues/736)) ([7f5fbc7](https://github.com/callstack/react-native-builder-bob/commit/7f5fbc7a8ac8c68fedc2e62cff91b2696d74b635)), closes [#728](https://github.com/callstack/react-native-builder-bob/issues/728) - by @atlj
11+
12+
### Features
13+
14+
* update gh actions in template from `v3` to `v4` ([#748](https://github.com/callstack/react-native-builder-bob/issues/748)) ([64a469c](https://github.com/callstack/react-native-builder-bob/commit/64a469c55b3944284d8caa505a8b5e3f3e3a8bfe)) - by @krozniata
15+
616
## [0.35.3](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.35.3) (2025-01-28)
717

818
### Bug Fixes

0 commit comments

Comments
 (0)