Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Cap-go/capacitor-inappbrowser
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6.9.36
Choose a base ref
...
head repository: Cap-go/capacitor-inappbrowser
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7.1.0
Choose a head ref
  • 4 commits
  • 12 files changed
  • 3 contributors

Commits on Jan 24, 2025

  1. feat: migrate to capacitor v7

    WcaleNieWolny committed Jan 24, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    2a7fcc3 View commit details

Commits on Jan 26, 2025

  1. Merge pull request #270 from Cap-go/capacitor_7

    feat: migrate to capacitor v7
    WcaleNieWolny authored Jan 26, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    4203824 View commit details

Commits on Jan 27, 2025

  1. fix: pnpm lock

    WcaleNieWolny committed Jan 27, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    8599575 View commit details
  2. chore(release): 7.1.0

    github-actions[bot] committed Jan 27, 2025
    Copy the full SHA
    f90c95c View commit details
Showing with 5,245 additions and 462 deletions.
  1. +0 −2 .prettierignore
  2. +12 −0 CHANGELOG.md
  3. +1 −1 CapgoInappbrowser.podspec
  4. +9 −9 android/build.gradle
  5. +1 −1 android/gradle/wrapper/gradle-wrapper.properties
  6. +2 −1 android/gradlew
  7. +4 −4 ios/Plugin.xcodeproj/project.pbxproj
  8. +8 −1 ios/Plugin/WKWebViewController.swift
  9. +1 −1 ios/Podfile
  10. +4,865 −0 package-lock.json
  11. +10 −10 package.json
  12. +332 −432 pnpm-lock.yaml
2 changes: 0 additions & 2 deletions .prettierignore

This file was deleted.

12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,18 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [7.1.0](https://github.com/Cap-go/capacitor-inappbrowser/compare/6.9.36...7.1.0) (2025-01-27)


### Features

* migrate to capacitor v7 ([2a7fcc3](https://github.com/Cap-go/capacitor-inappbrowser/commit/2a7fcc35ede945da00aff6177dd81b85bc60aeb5))


### Bug Fixes

* pnpm lock ([8599575](https://github.com/Cap-go/capacitor-inappbrowser/commit/85995757dbeaf6013bd28e46f5a6b1d9e31ec2ce))

### [6.9.36](https://github.com/Cap-go/capacitor-inappbrowser/compare/6.9.35...6.9.36) (2025-01-23)

### [6.9.35](https://github.com/Cap-go/capacitor-inappbrowser/compare/6.9.34...6.9.35) (2025-01-20)
2 changes: 1 addition & 1 deletion CapgoInappbrowser.podspec
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.author = package['author']
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
s.ios.deployment_target = '13.0'
s.ios.deployment_target = '14.0'
s.dependency 'Capacitor'
s.swift_version = '5.1'
end
18 changes: 9 additions & 9 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ext {
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.7.0'
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.8.0'
}

buildscript {
@@ -20,10 +20,10 @@ apply plugin: 'com.android.library'

android {
namespace "ee.forgr.capacitor_inappbrowser"
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
defaultConfig {
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -38,8 +38,8 @@ android {
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
}

2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
3 changes: 2 additions & 1 deletion android/gradlew
Original file line number Diff line number Diff line change
@@ -86,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
8 changes: 4 additions & 4 deletions ios/Plugin.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -387,7 +387,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -447,7 +447,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
@@ -471,7 +471,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -504,7 +504,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
9 changes: 8 additions & 1 deletion ios/Plugin/WKWebViewController.swift
Original file line number Diff line number Diff line change
@@ -838,7 +838,14 @@ fileprivate extension WKWebViewController {

// MARK: - WKUIDelegate
extension WKWebViewController: WKUIDelegate {

public func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
// Ensure UI updates are on the main thread
DispatchQueue.main.async {
let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)
self.present(alertController, animated: true, completion: nil)
}
completionHandler()
}
}

// MARK: - WKNavigationDelegate
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '13.0'
platform :ios, '14.0'

def capacitor_pods
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
Loading