Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/capacitor-plugin/CapacitorFileTransfer.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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/FileTransferPlugin/*.{swift,h,m,c,cc,mm,cpp}'
s.ios.deployment_target = '15.0'
s.ios.deployment_target = '16.0'
s.dependency 'IONFileTransferLib', spec='~> 1.0.2'
s.dependency 'Capacitor'
s.swift_version = '5.1'
Expand Down
5 changes: 2 additions & 3 deletions packages/capacitor-plugin/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@ import PackageDescription

let package = Package(
name: "CapacitorFileTransfer",
platforms: [.iOS(.v15)],
platforms: [.iOS(.v16)],
products: [
.library(
name: "CapacitorFileTransfer",
targets: ["FileTransferPlugin"]
)
],
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-filetransfer.git", from: "1.0.2")
],
targets: [
.target(
name: "FileTransferPlugin",
dependencies: [
.product(name: "Capacitor", package: "capacitor-swift-pm"),
.product(name: "Cordova", package: "capacitor-swift-pm"),
.product(name: "IONFileTransferLib", package: "ion-ios-filetransfer")
],
path: "ios/Sources/FileTransferPlugin"),
Expand Down
10 changes: 3 additions & 7 deletions packages/capacitor-plugin/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.filetransfer"
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"
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
7 changes: 2 additions & 5 deletions packages/capacitor-plugin/android/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 10 additions & 22 deletions packages/capacitor-plugin/android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/capacitor-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@ionic/swiftlint-config": "^2.0.0",
"@rollup/wasm-node": "~4.53.3",
Expand All @@ -82,12 +82,12 @@
"rimraf": "^6.1.2",
"semantic-release": "^25.0.2",
"swiftlint": "^2.0.0",
"typescript": "^5.9.3",
"typescript": "~5.9.3",
"vite": "^7.2.4",
"vite-plugin-dts": "^4.5.4"
},
"peerDependencies": {
"@capacitor/core": ">=8.0.0"
"@capacitor/core": ">=9.0.0-alpha.5"
},
"swiftlint": "@ionic/swiftlint-config",
"overrides": {
Expand Down
10 changes: 1 addition & 9 deletions packages/example-app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ android {
defaultConfig {
applicationId "com.capacitorjs.exampleapp.plugins.filetransfer"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -19,17 +18,11 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
}

repositories {
flatDir{
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
Expand All @@ -39,7 +32,6 @@ dependencies {
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
implementation project(':capacitor-cordova-android-plugins')
}

apply from: 'capacitor.build.gradle'
Expand Down
1 change: 0 additions & 1 deletion packages/example-app/android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ android {
}
}

apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-file-transfer')
implementation project(':capacitor-file-viewer')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:theme="@style/AppTheme">

<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
android:name=".MainActivity"
android:label="@string/title_activity_main"
android:theme="@style/AppTheme.NoActionBarLaunch"
Expand Down
4 changes: 2 additions & 2 deletions packages/example-app/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.13.0'
classpath 'com.google.gms:google-services:4.4.4'
classpath 'com.android.tools.build:gradle:9.2.1'
classpath 'com.google.gms:google-services:4.5.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
1 change: 1 addition & 0 deletions packages/example-app/android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')


include ':capacitor-file-transfer'
project(':capacitor-file-transfer').projectDir = new File('../../capacitor-plugin/android')

Expand Down
Binary file modified packages/example-app/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
7 changes: 2 additions & 5 deletions packages/example-app/android/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 10 additions & 22 deletions packages/example-app/android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions packages/example-app/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include ':app'
include ':capacitor-cordova-android-plugins'
project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')

apply from: 'capacitor.settings.gradle'
Loading
Loading