Skip to content

Commit

Permalink
feat: swap xcframework for cocoapod + update android aar
Browse files Browse the repository at this point in the history
  • Loading branch information
OS-martacarlos committed Aug 21, 2024
1 parent 5ce82bc commit 542b0e9
Show file tree
Hide file tree
Showing 41 changed files with 1,914 additions and 22,097 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ Publishing is automated based on the branch committed to. When a commit or merge
| Branch Name | Build Type | NPM Tag | Example NPM Version |
|---|---|---|---|
| dev | dev | dev | @capacitor/os-[email protected] |
| next | next (these are betas/alphas) | next | @capacitor/os-[email protected] |
| main | latest | latest | @capacitor/os-[email protected] |
| dev | dev | dev | @capacitor/[email protected] |
| next | next (these are betas/alphas) | next | @capacitor/[email protected] |
| main | latest | latest | @capacitor/[email protected] |
Dev work should be done by creating and merging PR's into the `dev` branch until a feature set is complete enough to then merge the `dev` branch into the `next` branch where it becomes a beta/alpha tagged under `next` for testing teams to use before full release. Upon completed testing the `next` branch is merged into `main` for a full release to be made. The `main` branch should then be merged into `dev` and `next` to keep them up to date with the latest code base.

Expand Down
2 changes: 1 addition & 1 deletion CapacitorInappbrowser.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Pod::Spec.new do |s|
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
#s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
s.source_files = 'ios/Sources/InAppBrowserPlugin/*.{swift,h,m,c,cc,mm,cpp}'
s.vendored_frameworks = 'ios/Sources/InAppBrowserPlugin/OSInAppBrowserLib.xcframework'
s.ios.deployment_target = '13.0'
s.dependency 'OSInAppBrowserLib', spec='~> 1.0'
s.dependency 'Capacitor'
s.swift_version = '5.1'
end
3 changes: 1 addition & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ repositories {

dependencies {
// implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "com.github.outsystems:osinappbrowser-android:0.+@aar"
implementation project(':capacitor-android')
implementation "com.github.outsystems:osinappbrowser-android:0.0.29@aar"
implementation "com.github.outsystems:osinappbrowser-android:1.+@aar"
implementation 'androidx.browser:browser:1.8.0'
implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha13"
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
Expand Down
2 changes: 1 addition & 1 deletion example-app/android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
implementation project(':capacitor-app')
implementation project(':capacitor-haptics')
implementation project(':capacitor-keyboard')
implementation project(':capacitor-os-inappbrowser')
implementation project(':capacitor-inappbrowser')
implementation project(':capacitor-status-bar')

}
Expand Down
4 changes: 2 additions & 2 deletions example-app/android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/
include ':capacitor-keyboard'
project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')

include ':capacitor-os-inappbrowser'
project(':capacitor-os-inappbrowser').projectDir = new File('../node_modules/@capacitor/os-inappbrowser/android')
include ':capacitor-inappbrowser'
project(':capacitor-inappbrowser').projectDir = new File('../node_modules/@capacitor/inappbrowser/android')

include ':capacitor-status-bar'
project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
8 changes: 6 additions & 2 deletions example-app/ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = EVSWK8BA55;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = io.ionic.starter;
PRODUCT_BUNDLE_IDENTIFIER = com.outsystems.rd;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 5.0;
Expand All @@ -367,14 +368,17 @@
baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = F898TC6427;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = io.ionic.starter;
PRODUCT_BUNDLE_IDENTIFIER = com.outsystems.rd;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
2 changes: 1 addition & 1 deletion example-app/ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>example-app</string>
<string>example-app</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion example-app/ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def capacitor_pods
pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
pod 'CapacitorOsInappbrowser', :path => '../../..'
pod 'CapacitorInappbrowser', :path => '../../..'
pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
end

Expand Down
Loading

0 comments on commit 542b0e9

Please sign in to comment.