Skip to content

Commit b939b33

Browse files
author
Wojtach
committed
fix: restored files
1 parent 5e60702 commit b939b33

File tree

3 files changed

+34
-38
lines changed

3 files changed

+34
-38
lines changed

‎expo-example/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
minSdkVersion = Integer.parseInt(findProperty('android.minSdkVersion') ?: '24')
77
compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '35')
88
targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '34')
9-
kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.25'
9+
kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.24'
1010

1111
ndkVersion = "26.1.10909125"
1212
}

‎expo-example/android/settings.gradle‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pluginManagement {
2-
includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().toString())
2+
includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json')"].execute(null, rootDir).text.trim()).getParentFile().toString())
33
}
44
plugins { id("com.facebook.react.settings") }
55

@@ -20,19 +20,15 @@ extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
2020
ex.autolinkLibrariesFromCommand(command)
2121
}
2222
}
23-
2423
rootProject.name = 'expo-example'
25-
2624
dependencyResolutionManagement {
2725
versionCatalogs {
2826
reactAndroidLibs {
2927
from(files(new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim(), "../gradle/libs.versions.toml")))
3028
}
3129
}
3230
}
33-
3431
apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle");
3532
useExpoModules()
36-
3733
include ':app'
38-
includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile())
34+
includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')]

‎expo-example/ios/expoexample.xcodeproj/project.pbxproj‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1212
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1313
3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; };
14-
731F769D27574E24B7F7B509 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85087DAF82540C5928A8F6E /* noop-file.swift */; };
15-
8109C867EEF719955D09888C /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3EA699958071C3FEC76E20FC /* PrivacyInfo.xcprivacy */; };
14+
503E8E5AE90C4304884407AB /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C9F1BCDE41C4DCCA640F912 /* noop-file.swift */; };
15+
73E0B11BE194C3900D42C8D4 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A458C5DA0D90131FF0A39449 /* PrivacyInfo.xcprivacy */; };
1616
96905EF65AED1B983A6B3ABC /* libPods-expoexample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-expoexample.a */; };
1717
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; };
1818
BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
@@ -25,14 +25,14 @@
2525
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = expoexample/Images.xcassets; sourceTree = "<group>"; };
2626
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = expoexample/Info.plist; sourceTree = "<group>"; };
2727
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = expoexample/main.m; sourceTree = "<group>"; };
28-
3EA699958071C3FEC76E20FC /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = expoexample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
2928
58EEBF8E8E6FB1BC6CAF49B5 /* libPods-expoexample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-expoexample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3029
6C2E3173556A471DD304B334 /* Pods-expoexample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-expoexample.debug.xcconfig"; path = "Target Support Files/Pods-expoexample/Pods-expoexample.debug.xcconfig"; sourceTree = "<group>"; };
3130
7A4D352CD337FB3A3BF06240 /* Pods-expoexample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-expoexample.release.xcconfig"; path = "Target Support Files/Pods-expoexample/Pods-expoexample.release.xcconfig"; sourceTree = "<group>"; };
31+
9C9F1BCDE41C4DCCA640F912 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "expoexample/noop-file.swift"; sourceTree = "<group>"; };
32+
A458C5DA0D90131FF0A39449 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = expoexample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
33+
A4A9353B5C0F4257B1276690 /* expoexample-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "expoexample-Bridging-Header.h"; path = "expoexample/expoexample-Bridging-Header.h"; sourceTree = "<group>"; };
3234
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = expoexample/SplashScreen.storyboard; sourceTree = "<group>"; };
33-
B85087DAF82540C5928A8F6E /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "expoexample/noop-file.swift"; sourceTree = "<group>"; };
3435
BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
35-
CFC0785FAF274CFB98AFCA6B /* expoexample-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "expoexample-Bridging-Header.h"; path = "expoexample/expoexample-Bridging-Header.h"; sourceTree = "<group>"; };
3636
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
3737
FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-expoexample/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
3838
/* End PBXFileReference section */
@@ -59,9 +59,9 @@
5959
13B07FB61A68108700A75B9A /* Info.plist */,
6060
13B07FB71A68108700A75B9A /* main.m */,
6161
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */,
62-
B85087DAF82540C5928A8F6E /* noop-file.swift */,
63-
CFC0785FAF274CFB98AFCA6B /* expoexample-Bridging-Header.h */,
64-
3EA699958071C3FEC76E20FC /* PrivacyInfo.xcprivacy */,
62+
9C9F1BCDE41C4DCCA640F912 /* noop-file.swift */,
63+
A4A9353B5C0F4257B1276690 /* expoexample-Bridging-Header.h */,
64+
A458C5DA0D90131FF0A39449 /* PrivacyInfo.xcprivacy */,
6565
);
6666
name = expoexample;
6767
sourceTree = "<group>";
@@ -147,13 +147,13 @@
147147
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "expoexample" */;
148148
buildPhases = (
149149
08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */,
150-
5C0C5AD6667AEDC4666B2135 /* [Expo] Configure project */,
150+
AB4628C62C52E5D91E834A8E /* [Expo] Configure project */,
151151
13B07F871A680F5B00A75B9A /* Sources */,
152152
13B07F8C1A680F5B00A75B9A /* Frameworks */,
153153
13B07F8E1A680F5B00A75B9A /* Resources */,
154154
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
155155
800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */,
156-
A19D7682694D953FA28C42D3 /* [CP] Embed Pods Frameworks */,
156+
5653DE342E0D2DCB1EEF0E11 /* [CP] Embed Pods Frameworks */,
157157
);
158158
buildRules = (
159159
);
@@ -203,7 +203,7 @@
203203
BB2F792D24A3F905000567C9 /* Expo.plist in Resources */,
204204
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
205205
3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */,
206-
8109C867EEF719955D09888C /* PrivacyInfo.xcprivacy in Resources */,
206+
73E0B11BE194C3900D42C8D4 /* PrivacyInfo.xcprivacy in Resources */,
207207
);
208208
runOnlyForDeploymentPostprocessing = 0;
209209
};
@@ -247,24 +247,25 @@
247247
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
248248
showEnvVarsInLog = 0;
249249
};
250-
5C0C5AD6667AEDC4666B2135 /* [Expo] Configure project */ = {
250+
5653DE342E0D2DCB1EEF0E11 /* [CP] Embed Pods Frameworks */ = {
251251
isa = PBXShellScriptBuildPhase;
252-
alwaysOutOfDate = 1;
253252
buildActionMask = 2147483647;
254253
files = (
255254
);
256-
inputFileListPaths = (
257-
);
258255
inputPaths = (
256+
"${PODS_ROOT}/Target Support Files/Pods-expoexample/Pods-expoexample-frameworks.sh",
257+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/CouchbaseLite-Swift-Enterprise/CouchbaseLiteSwift.framework/CouchbaseLiteSwift",
258+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
259259
);
260-
name = "[Expo] Configure project";
261-
outputFileListPaths = (
262-
);
260+
name = "[CP] Embed Pods Frameworks";
263261
outputPaths = (
262+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CouchbaseLiteSwift.framework",
263+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
264264
);
265265
runOnlyForDeploymentPostprocessing = 0;
266266
shellPath = /bin/sh;
267-
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-expoexample/expo-configure-project.sh\"\n";
267+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-expoexample/Pods-expoexample-frameworks.sh\"\n";
268+
showEnvVarsInLog = 0;
268269
};
269270
800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = {
270271
isa = PBXShellScriptBuildPhase;
@@ -306,25 +307,24 @@
306307
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-expoexample/Pods-expoexample-resources.sh\"\n";
307308
showEnvVarsInLog = 0;
308309
};
309-
A19D7682694D953FA28C42D3 /* [CP] Embed Pods Frameworks */ = {
310+
AB4628C62C52E5D91E834A8E /* [Expo] Configure project */ = {
310311
isa = PBXShellScriptBuildPhase;
312+
alwaysOutOfDate = 1;
311313
buildActionMask = 2147483647;
312314
files = (
313315
);
316+
inputFileListPaths = (
317+
);
314318
inputPaths = (
315-
"${PODS_ROOT}/Target Support Files/Pods-expoexample/Pods-expoexample-frameworks.sh",
316-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/CouchbaseLite-Swift-Enterprise/CouchbaseLiteSwift.framework/CouchbaseLiteSwift",
317-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
318319
);
319-
name = "[CP] Embed Pods Frameworks";
320+
name = "[Expo] Configure project";
321+
outputFileListPaths = (
322+
);
320323
outputPaths = (
321-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CouchbaseLiteSwift.framework",
322-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
323324
);
324325
runOnlyForDeploymentPostprocessing = 0;
325326
shellPath = /bin/sh;
326-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-expoexample/Pods-expoexample-frameworks.sh\"\n";
327-
showEnvVarsInLog = 0;
327+
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-expoexample/expo-configure-project.sh\"\n";
328328
};
329329
/* End PBXShellScriptBuildPhase section */
330330

@@ -336,7 +336,7 @@
336336
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
337337
13B07FC11A68108700A75B9A /* main.m in Sources */,
338338
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */,
339-
731F769D27574E24B7F7B509 /* noop-file.swift in Sources */,
339+
503E8E5AE90C4304884407AB /* noop-file.swift in Sources */,
340340
);
341341
runOnlyForDeploymentPostprocessing = 0;
342342
};
@@ -367,7 +367,7 @@
367367
);
368368
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
369369
PRODUCT_BUNDLE_IDENTIFIER = "com.couchbase.rn.expo-example";
370-
PRODUCT_NAME = "expoexample";
370+
PRODUCT_NAME = expoexample;
371371
SWIFT_OBJC_BRIDGING_HEADER = "expoexample/expoexample-Bridging-Header.h";
372372
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
373373
SWIFT_VERSION = 5.0;
@@ -395,7 +395,7 @@
395395
);
396396
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
397397
PRODUCT_BUNDLE_IDENTIFIER = "com.couchbase.rn.expo-example";
398-
PRODUCT_NAME = "expoexample";
398+
PRODUCT_NAME = expoexample;
399399
SWIFT_OBJC_BRIDGING_HEADER = "expoexample/expoexample-Bridging-Header.h";
400400
SWIFT_VERSION = 5.0;
401401
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)