-
Notifications
You must be signed in to change notification settings - Fork 6
EE/CC #69
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.
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
Open
Wojtach
wants to merge
2
commits into
Couchbase-Ecosystem:main
Choose a base branch
from
Wojtach:ee-cc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
EE/CC #69
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,4 +6,7 @@ dist/ | |
| lib/ | ||
| src/cblite-js | ||
| ios/ | ||
| bable.config.js | ||
| bable.config.js | ||
| scripts/ | ||
| plugin/ | ||
| app.plugin.js | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule cbl-js-kotlin
updated
3 files
| +53 −0 | CouchbaseReflectionHelper.kt | |
| +4 −4 | DatabaseManager.kt | |
| +2 −1 | ReplicatorHelper.kt |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| module.exports = require('./plugin/src/withCouchbaseLite'); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "edition": "CE", | ||
| "version": "3.2.1", | ||
| "timestamp": "2024-01-01T00:00:00.000Z" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| const { withDangerousMod, withPlugins } = require('@expo/config-plugins'); | ||
| const { withAppBuildGradle } = require('@expo/config-plugins'); | ||
| const fs = require('fs'); | ||
| const path = require('path'); | ||
|
|
||
| const EDITIONS = { | ||
| CE: { | ||
| android: 'com.couchbase.lite:couchbase-lite-android-ktx', | ||
| ios: 'CouchbaseLite-Swift', | ||
| }, | ||
| EE: { | ||
| android: 'com.couchbase.lite:couchbase-lite-android-ee-ktx', | ||
| ios: 'CouchbaseLite-Enterprise-Swift', | ||
| }, | ||
| }; | ||
|
|
||
| const VERSION = '3.2.1'; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
| function readEditionConfig(projectRoot) { | ||
| try { | ||
| const configPath = path.join(projectRoot, 'cbl-edition.json'); | ||
| if (fs.existsSync(configPath)) { | ||
| const config = JSON.parse(fs.readFileSync(configPath, 'utf8')); | ||
| return config.edition || 'CE'; | ||
| } | ||
| } catch (error) { | ||
| console.log('No cbl-edition.json found, using default CE edition'); | ||
| } | ||
| return 'CE'; | ||
| } | ||
|
|
||
| const withCouchbaseLiteAndroid = (config, { edition }) => { | ||
| return withAppBuildGradle(config, (config) => { | ||
| const dependency = EDITIONS[edition].android; | ||
|
|
||
| config.modResults.contents = config.modResults.contents.replace( | ||
| /dependencies\s*{/, | ||
| `dependencies { | ||
| // Couchbase Lite Edition Override | ||
| configurations.all { | ||
| resolutionStrategy { | ||
| force "${dependency}:${VERSION}" | ||
| } | ||
| } | ||
| ` | ||
| ); | ||
|
|
||
| return config; | ||
| }); | ||
| }; | ||
|
|
||
| const withCouchbaseLiteIOS = (config, { edition }) => { | ||
| return withDangerousMod(config, [ | ||
| 'ios', | ||
| async (config) => { | ||
| const dependency = EDITIONS[edition].ios; | ||
| const podfilePath = path.join( | ||
| config.modRequest.platformProjectRoot, | ||
| 'Podfile' | ||
| ); | ||
|
|
||
| if (fs.existsSync(podfilePath)) { | ||
| let podfile = fs.readFileSync(podfilePath, 'utf8'); | ||
|
|
||
| // Remove any existing Couchbase pod overrides | ||
| podfile = podfile.replace( | ||
| /\n\s*# Couchbase Lite Edition Override[\s\S]*?pod 'CouchbaseLite[^']*'[^\n]*\n/g, | ||
| '' | ||
| ); | ||
|
|
||
| // Add the correct pod | ||
| const podOverride = `\n # Couchbase Lite Edition Override\n pod '${dependency}', '${VERSION}', :modular_headers => true\n`; | ||
|
|
||
| // Add before use_react_native! | ||
| podfile = podfile.replace(/(use_react_native!)/, `${podOverride} $1`); | ||
|
|
||
| // Add EE source if needed | ||
| if (edition === 'EE') { | ||
| if ( | ||
| !podfile.includes( | ||
| 'https://github.com/couchbase/couchbase-lite-ios-ee.git' | ||
| ) | ||
| ) { | ||
| podfile = `source 'https://github.com/couchbase/couchbase-lite-ios-ee.git'\n${podfile}`; | ||
| } | ||
| } | ||
|
|
||
| fs.writeFileSync(podfilePath, podfile); | ||
| } | ||
|
|
||
| return config; | ||
| }, | ||
| ]); | ||
| }; | ||
|
|
||
| function withCouchbaseLite(config, props = {}) { | ||
| // First try to read from props, then from config file | ||
| let edition = props.edition; | ||
|
|
||
| if (!edition) { | ||
| const projectRoot = config._internal?.projectRoot || process.cwd(); | ||
| edition = readEditionConfig(projectRoot); | ||
| } | ||
|
|
||
| edition = edition?.toUpperCase() || 'CE'; | ||
|
|
||
| if (!EDITIONS[edition]) { | ||
| throw new Error( | ||
| `Invalid Couchbase Lite edition: ${edition}. Use 'CE' or 'EE'.` | ||
| ); | ||
| } | ||
|
|
||
| return withPlugins(config, [ | ||
| [withCouchbaseLiteAndroid, { edition }], | ||
| [withCouchbaseLiteIOS, { edition }], | ||
| ]); | ||
| } | ||
|
|
||
| module.exports = withCouchbaseLite; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The file ends with a dangling code block fence (
```). This will likely cause markdown rendering issues and should be removed.