Skip to content

Commit 626b83f

Browse files
authored
refactor: drop java templates to simplify maintenance (#601)
1 parent 3a4e724 commit 626b83f

File tree

21 files changed

+5
-593
lines changed

21 files changed

+5
-593
lines changed

.github/workflows/build-templates.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,15 @@ jobs:
3737
- view-mixed
3838
- view-new
3939
language:
40-
- java-objc
41-
- java-swift
4240
- kotlin-objc
4341
- kotlin-swift
4442
exclude:
45-
- os: macos-14
46-
language: kotlin-objc
47-
- os: macos-14
48-
language: kotlin-swift
49-
- type: module-new
50-
language: java-swift
5143
- type: module-new
5244
language: kotlin-swift
53-
- type: module-mixed
54-
language: java-swift
5545
- type: module-mixed
5646
language: kotlin-swift
57-
- type: view-new
58-
language: java-swift
5947
- type: view-new
6048
language: kotlin-swift
61-
- type: view-mixed
62-
language: java-swift
6349
- type: view-mixed
6450
language: kotlin-swift
6551
include:
@@ -161,7 +147,7 @@ jobs:
161147
162148
# Build iOS for only some matrices to skip redundant builds
163149
if [[ ${{ matrix.os }} == macos-14 ]]; then
164-
if [[ ${{ matrix.type }} == view-* && ${{ matrix.language }} == java-* ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == java-* ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == cpp ]]; then
150+
if [[ ${{ matrix.type }} == view-* && ${{ matrix.language }} == kotlin-* ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == kotlin-* ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == cpp ]]; then
165151
echo "ios_build=1" >> $GITHUB_ENV
166152
fi
167153
fi

packages/create-react-native-library/src/index.ts

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,6 @@ const NATIVE_FILES = {
4848
view_new: path.resolve(__dirname, '../templates/native-view-new'),
4949
} as const;
5050

51-
const JAVA_FILES = {
52-
module_legacy: path.resolve(__dirname, '../templates/java-library-legacy'),
53-
module_new: path.resolve(__dirname, '../templates/java-library-new'),
54-
module_mixed: path.resolve(__dirname, '../templates/java-library-mixed'),
55-
view_legacy: path.resolve(__dirname, '../templates/java-view-legacy'),
56-
view_mixed: path.resolve(__dirname, '../templates/java-view-mixed'),
57-
view_new: path.resolve(__dirname, '../templates/java-view-new'),
58-
} as const;
59-
6051
const OBJC_FILES = {
6152
module_common: path.resolve(__dirname, '../templates/objc-library'),
6253
view_legacy: path.resolve(__dirname, '../templates/objc-view-legacy'),
@@ -91,13 +82,7 @@ type ArgName =
9182
| 'example'
9283
| 'react-native-version';
9384

94-
type ProjectLanguages =
95-
| 'java-objc'
96-
| 'java-swift'
97-
| 'kotlin-objc'
98-
| 'kotlin-swift'
99-
| 'cpp'
100-
| 'js';
85+
type ProjectLanguages = 'kotlin-objc' | 'kotlin-swift' | 'cpp' | 'js';
10186

10287
type ProjectType =
10388
| 'module-legacy'
@@ -140,28 +125,11 @@ const LANGUAGE_CHOICES: {
140125
'view-legacy',
141126
],
142127
},
143-
{
144-
title: 'Java & Objective-C',
145-
value: 'java-objc',
146-
types: [
147-
'module-legacy',
148-
'module-new',
149-
'module-mixed',
150-
'view-mixed',
151-
'view-new',
152-
'view-legacy',
153-
],
154-
},
155128
{
156129
title: 'Kotlin & Swift',
157130
value: 'kotlin-swift',
158131
types: ['module-legacy', 'view-legacy'],
159132
},
160-
{
161-
title: 'Java & Swift',
162-
value: 'java-swift',
163-
types: ['module-legacy', 'view-legacy'],
164-
},
165133
{
166134
title: 'C++ for Android & iOS',
167135
value: 'cpp',
@@ -603,7 +571,7 @@ async function create(_argv: yargs.Arguments<any>) {
603571
authorUrl,
604572
repoUrl,
605573
type = 'module-mixed',
606-
languages = type === 'library' ? 'js' : 'java-objc',
574+
languages = type === 'library' ? 'js' : 'kotlin-objc',
607575
example = local ? 'none' : type === 'library' ? 'expo' : 'test-app',
608576
reactNativeVersion,
609577
} = answers;
@@ -669,8 +637,7 @@ async function create(_argv: yargs.Arguments<any>) {
669637
native: languages !== 'js',
670638
arch,
671639
cpp: languages === 'cpp',
672-
kotlin: languages === 'kotlin-objc' || languages === 'kotlin-swift',
673-
swift: languages === 'java-swift' || languages === 'kotlin-swift',
640+
swift: languages === 'kotlin-swift',
674641
view: moduleType === 'view',
675642
module: moduleType === 'module',
676643
},
@@ -788,11 +755,7 @@ async function create(_argv: yargs.Arguments<any>) {
788755

789756
const templateType = `${moduleType}_${arch}` as const;
790757

791-
if (options.project.kotlin) {
792-
await copyDir(KOTLIN_FILES[templateType], folder);
793-
} else {
794-
await copyDir(JAVA_FILES[templateType], folder);
795-
}
758+
await copyDir(KOTLIN_FILES[templateType], folder);
796759

797760
if (options.project.cpp) {
798761
await copyDir(CPP_FILES, folder);

packages/create-react-native-library/templates/java-library-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

packages/create-react-native-library/templates/java-library-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

packages/create-react-native-library/templates/java-library-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

packages/create-react-native-library/templates/java-library-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

packages/create-react-native-library/templates/java-library-mixed/android/src/newarch/{%- project.name %}Spec.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/create-react-native-library/templates/java-library-mixed/android/src/oldarch/{%- project.name %}Spec.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/create-react-native-library/templates/java-library-new/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)