Skip to content

Commit df2b2f9

Browse files
feat: support for Android #16
1 parent 3e06e48 commit df2b2f9

35 files changed

+1539
-69
lines changed

Brewfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Core development tools
55
brew "clang-format"
66
brew "ccache"
7+
brew "ktlint"
78

89
# Additional useful tools for React Native development
910
brew "node"

apps/demo/android/app/build.gradle

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ apply plugin: "com.facebook.react"
88
*/
99
react {
1010
/* Folders */
11-
// The root of your project, i.e. where "package.json" lives. Default is '../..'
12-
// root = file("../../")
13-
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
14-
// reactNativeDir = file("../../node_modules/react-native")
15-
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
16-
// codegenDir = file("../../node_modules/@react-native/codegen")
17-
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
18-
// cliFile = file("../../node_modules/react-native/cli.js")
11+
root = file("../..")
12+
reactNativeDir = file("../../../../node_modules/react-native")
13+
codegenDir = file("../../../../node_modules/@react-native/codegen")
14+
cliFile = file("../../../../node_modules/react-native/cli.js")
1915

2016
/* Variants */
2117
// The list of variants to that are debuggable. For those we're going to

apps/demo/android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
1+
pluginManagement { includeBuild("../../../node_modules/@react-native/gradle-plugin") }
22
plugins { id("com.facebook.react.settings") }
33
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
44
rootProject.name = 'Demo'
55
include ':app'
6-
includeBuild('../node_modules/@react-native/gradle-plugin')
6+
includeBuild('../../../node_modules/@react-native/gradle-plugin')

apps/fs-experiment/android/app/build.gradle

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ apply plugin: "com.facebook.react"
88
*/
99
react {
1010
/* Folders */
11-
// The root of your project, i.e. where "package.json" lives. Default is '../..'
12-
// root = file("../../")
13-
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
14-
// reactNativeDir = file("../../node_modules/react-native")
15-
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
16-
// codegenDir = file("../../node_modules/@react-native/codegen")
17-
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
18-
// cliFile = file("../../node_modules/react-native/cli.js")
11+
root = file("../..")
12+
reactNativeDir = file("../../../../node_modules/react-native")
13+
codegenDir = file("../../../../node_modules/@react-native/codegen")
14+
cliFile = file("../../../../node_modules/react-native/cli.js")
1915

2016
/* Variants */
2117
// The list of variants to that are debuggable. For those we're going to

apps/fs-experiment/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
compileSdkVersion = 35
66
targetSdkVersion = 35
77
ndkVersion = "27.1.12297006"
8-
kotlinVersion = "2.0.21"
8+
kotlinVersion = "2.1.20"
99
}
1010
repositories {
1111
google()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
1+
pluginManagement { includeBuild("../../../node_modules/@react-native/gradle-plugin") }
22
plugins { id("com.facebook.react.settings") }
33
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
44
rootProject.name = 'MultInstance-Recursive'
55
include ':app'
6-
includeBuild('../node_modules/@react-native/gradle-plugin')
6+
includeBuild('../../../node_modules/@react-native/gradle-plugin')

apps/p2p-chat/android/app/build.gradle

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ apply plugin: "com.facebook.react"
88
*/
99
react {
1010
/* Folders */
11-
// The root of your project, i.e. where "package.json" lives. Default is '../..'
12-
// root = file("../../")
13-
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
14-
// reactNativeDir = file("../../node_modules/react-native")
15-
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
16-
// codegenDir = file("../../node_modules/@react-native/codegen")
17-
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
18-
// cliFile = file("../../node_modules/react-native/cli.js")
11+
root = file("../..")
12+
reactNativeDir = file("../../../../node_modules/react-native")
13+
codegenDir = file("../../../../node_modules/@react-native/codegen")
14+
cliFile = file("../../../../node_modules/react-native/cli.js")
1915

2016
/* Variants */
2117
// The list of variants to that are debuggable. For those we're going to
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
1+
pluginManagement { includeBuild("../../../node_modules/@react-native/gradle-plugin") }
22
plugins { id("com.facebook.react.settings") }
33
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
44
rootProject.name = 'P2PChat'
55
include ':app'
6-
includeBuild('../node_modules/@react-native/gradle-plugin')
6+
includeBuild('../../../node_modules/@react-native/gradle-plugin')

apps/p2p-counter/android/app/build.gradle

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ apply plugin: "com.facebook.react"
88
*/
99
react {
1010
/* Folders */
11-
// The root of your project, i.e. where "package.json" lives. Default is '../..'
12-
// root = file("../../")
13-
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
14-
// reactNativeDir = file("../../node_modules/react-native")
15-
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
16-
// codegenDir = file("../../node_modules/@react-native/codegen")
17-
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
18-
// cliFile = file("../../node_modules/react-native/cli.js")
11+
root = file("../..")
12+
reactNativeDir = file("../../../../node_modules/react-native")
13+
codegenDir = file("../../../../node_modules/@react-native/codegen")
14+
cliFile = file("../../../../node_modules/react-native/cli.js")
1915

2016
/* Variants */
2117
// The list of variants to that are debuggable. For those we're going to

apps/p2p-counter/android/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
<application
66
android:name=".MainApplication"
7-
android:label="P2P Counter"
87
android:label="@string/app_name"
98
android:icon="@mipmap/ic_launcher"
109
android:roundIcon="@mipmap/ic_launcher_round"

0 commit comments

Comments
 (0)