diff --git a/packages/capacitor-plugin/CapacitorFileViewer.podspec b/packages/capacitor-plugin/CapacitorFileViewer.podspec index 116b6b2..ac5f0c8 100644 --- a/packages/capacitor-plugin/CapacitorFileViewer.podspec +++ b/packages/capacitor-plugin/CapacitorFileViewer.podspec @@ -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/Sources/FileViewerPlugin/*.{swift,h,m,c,cc,mm,cpp}' - s.ios.deployment_target = '15.0' + s.ios.deployment_target = '16.0' s.dependency 'IONFileViewerLib', spec='~> 1.0.3' s.dependency 'Capacitor' s.swift_version = '5.1' diff --git a/packages/capacitor-plugin/Package.swift b/packages/capacitor-plugin/Package.swift index ae0a465..403d10f 100644 --- a/packages/capacitor-plugin/Package.swift +++ b/packages/capacitor-plugin/Package.swift @@ -3,14 +3,14 @@ import PackageDescription let package = Package( name: "CapacitorFileViewer", - platforms: [.iOS(.v15)], + platforms: [.iOS(.v16)], products: [ .library( name: "CapacitorFileViewer", targets: ["FileViewerPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"), + .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "9.0.0-alpha.5"), .package(url: "https://github.com/ionic-team/ion-ios-fileviewer.git", from: "1.0.3") ], targets: [ @@ -18,7 +18,6 @@ let package = Package( name: "FileViewerPlugin", dependencies: [ .product(name: "Capacitor", package: "capacitor-swift-pm"), - .product(name: "Cordova", package: "capacitor-swift-pm"), .product(name: "IONFileViewerLib", package: "ion-ios-fileviewer") ], path: "ios/Sources/FileViewerPlugin"), diff --git a/packages/capacitor-plugin/android/build.gradle b/packages/capacitor-plugin/android/build.gradle index 9a57403..fa6505e 100644 --- a/packages/capacitor-plugin/android/build.gradle +++ b/packages/capacitor-plugin/android/build.gradle @@ -6,26 +6,22 @@ ext { } buildscript { - ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.2.20' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:9.2.1' } } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace = "com.capacitorjs.plugins.fileviewer" - compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36 + compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 37 defaultConfig { - minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24 - targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36 + minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 26 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.jar b/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.jar index 1b33c55..b1b8ef5 100644 Binary files a/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.jar and b/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.properties b/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.properties index 7705927..e74c870 100644 --- a/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/capacitor-plugin/android/gradlew b/packages/capacitor-plugin/android/gradlew index 23d15a9..b9bb139 100755 --- a/packages/capacitor-plugin/android/gradlew +++ b/packages/capacitor-plugin/android/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/packages/capacitor-plugin/android/gradlew.bat b/packages/capacitor-plugin/android/gradlew.bat index 5eed7ee..aa5f10b 100644 --- a/packages/capacitor-plugin/android/gradlew.bat +++ b/packages/capacitor-plugin/android/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,30 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/packages/capacitor-plugin/package.json b/packages/capacitor-plugin/package.json index 16e024a..742212d 100644 --- a/packages/capacitor-plugin/package.json +++ b/packages/capacitor-plugin/package.json @@ -59,10 +59,10 @@ "@capacitor/synapse": "^1.0.4" }, "devDependencies": { - "@capacitor/android": "^8.0.0", - "@capacitor/core": "^8.0.0", + "@capacitor/android": "next", + "@capacitor/core": "next", "@capacitor/docgen": "^0.3.0", - "@capacitor/ios": "^8.0.0", + "@capacitor/ios": "next", "@eslint/js": "^9.39.1", "@rollup/wasm-node": "~4.53.3", "@semantic-release/changelog": "^6.0.3", @@ -86,7 +86,7 @@ "vite-plugin-dts": "^4.5.4" }, "peerDependencies": { - "@capacitor/core": ">=8.0.0" + "@capacitor/core": ">=9.0.0-alpha.5" }, "overrides": { "vite": {