From 6bc31c9f9ea8ce5967256acd025aa8cb1eb5a780 Mon Sep 17 00:00:00 2001 From: Eoin Landy Date: Sat, 14 Nov 2020 23:57:55 +0000 Subject: [PATCH] 1.6.0 --- CHANGELOG.md | 5 + README.md | 2 +- example/.idea/misc.xml | 2 +- .../.idea/runConfigurations/iOS_Simulator.xml | 3 +- example/VibrationANESample.iml | 8 +- example/air_package.json | 4 +- example/src/Main-app.xml | 4 +- native_extension/ane/air_package.json | 8 +- native_extension/ane/build.sh | 2 +- native_extension/ane/extension.xml | 2 +- .../ane/platforms/ios/platform.xml | 1 + .../android/VibrationANE/.idea/gradle.xml | 1 + .../android/VibrationANE/.idea/misc.xml | 2 +- .../android/VibrationANE/.idea/modules.xml | 4 +- .../.idea/modules/app/VibrationANE.app.iml | 89 ++++++++++++ .../android/VibrationANE/VibrationANE.iml | 3 +- .../android/VibrationANE/app/app.iml | 137 ------------------ .../android/VibrationANE/app/build.gradle | 8 +- .../android/VibrationANE/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- native_library/apple/VibrationANE/Cartfile | 2 +- .../VibrationANE.xcodeproj/project.pbxproj | 12 +- 22 files changed, 137 insertions(+), 172 deletions(-) create mode 100644 native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml delete mode 100644 native_library/android/VibrationANE/app/app.iml diff --git a/CHANGELOG.md b/CHANGELOG.md index 5617cb4..d969360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### 1.6.0 +- AND: Updated to FreKotlin 1.41.0 +- iOS: Updated to FreSwift 5.0.0 +- Upgraded to AIR 33.1.1.300 + ### 1.5.0 - AND: Updated to FreKotlin 1.40.0 - iOS: Updated to FreSwift 4.5.0 diff --git a/README.md b/README.md index a68f76e..3750cdc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You will need: - IntelliJ IDEA - AIR 33.1.1.217+ -- Xcode 11.6 +- Xcode 12.1 - [.Net Core Runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1) - [AIR-Tools](https://github.com/tuarua/AIR-Tools/) diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml index b164eff..45c69ec 100644 --- a/example/.idea/misc.xml +++ b/example/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/example/.idea/runConfigurations/iOS_Simulator.xml b/example/.idea/runConfigurations/iOS_Simulator.xml index 0704db0..fa7cae9 100644 --- a/example/.idea/runConfigurations/iOS_Simulator.xml +++ b/example/.idea/runConfigurations/iOS_Simulator.xml @@ -1,7 +1,8 @@ diff --git a/native_library/android/VibrationANE/.idea/misc.xml b/native_library/android/VibrationANE/.idea/misc.xml index cc04cd3..197c30e 100644 --- a/native_library/android/VibrationANE/.idea/misc.xml +++ b/native_library/android/VibrationANE/.idea/misc.xml @@ -35,7 +35,7 @@ - + diff --git a/native_library/android/VibrationANE/.idea/modules.xml b/native_library/android/VibrationANE/.idea/modules.xml index 9eb755e..8854e1d 100644 --- a/native_library/android/VibrationANE/.idea/modules.xml +++ b/native_library/android/VibrationANE/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml b/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml new file mode 100644 index 0000000..a0b22d1 --- /dev/null +++ b/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/native_library/android/VibrationANE/VibrationANE.iml b/native_library/android/VibrationANE/VibrationANE.iml index 0092e4c..3dc0546 100644 --- a/native_library/android/VibrationANE/VibrationANE.iml +++ b/native_library/android/VibrationANE/VibrationANE.iml @@ -8,10 +8,11 @@ - + + diff --git a/native_library/android/VibrationANE/app/app.iml b/native_library/android/VibrationANE/app/app.iml deleted file mode 100644 index 0aa9875..0000000 --- a/native_library/android/VibrationANE/app/app.iml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/native_library/android/VibrationANE/app/build.gradle b/native_library/android/VibrationANE/app/build.gradle index 1d4d1f6..29ff235 100644 --- a/native_library/android/VibrationANE/app/build.gradle +++ b/native_library/android/VibrationANE/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 - versionName "1.3.0" + versionName "1.6.0" } buildTypes { release { diff --git a/native_library/android/VibrationANE/build.gradle b/native_library/android/VibrationANE/build.gradle index 0a30dfd..df3f9ee 100644 --- a/native_library/android/VibrationANE/build.gradle +++ b/native_library/android/VibrationANE/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.0' - ext.frekotlin_version = '1.40.0' + ext.kotlin_version = '1.4.10' + ext.frekotlin_version = '1.41.0' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/native_library/android/VibrationANE/gradle/wrapper/gradle-wrapper.properties b/native_library/android/VibrationANE/gradle/wrapper/gradle-wrapper.properties index 321e4b6..9bc4f6a 100644 --- a/native_library/android/VibrationANE/gradle/wrapper/gradle-wrapper.properties +++ b/native_library/android/VibrationANE/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 03 20:30:16 BST 2020 +#Sun Oct 04 16:26:43 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/native_library/apple/VibrationANE/Cartfile b/native_library/apple/VibrationANE/Cartfile index e8d9ad6..61937dd 100644 --- a/native_library/apple/VibrationANE/Cartfile +++ b/native_library/apple/VibrationANE/Cartfile @@ -1 +1 @@ -binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/4.5.0/FreSwift.json" ~> 4.5.0 \ No newline at end of file +binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/FreSwift.json" ~> 5.0.0 \ No newline at end of file diff --git a/native_library/apple/VibrationANE/VibrationANE.xcodeproj/project.pbxproj b/native_library/apple/VibrationANE/VibrationANE.xcodeproj/project.pbxproj index 00be068..7e8e371 100644 --- a/native_library/apple/VibrationANE/VibrationANE.xcodeproj/project.pbxproj +++ b/native_library/apple/VibrationANE/VibrationANE.xcodeproj/project.pbxproj @@ -7,11 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - 901D78F023E376D500C92385 /* HapticEngineController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 901D78EF23E376D500C92385 /* HapticEngineController.swift */; }; + 901D78F023E376D500C92385 /* HapticEngineController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 901D78EF23E376D500C92385 /* HapticEngineController.swift */; platformFilter = ios; }; 9055E18E217141C80006CD4C /* TapticController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9055E18D217141C80006CD4C /* TapticController.swift */; platformFilter = ios; }; 906787BF217017D200100455 /* UIDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 906787BE217017D200100455 /* UIDevice.swift */; platformFilter = ios; }; - 90884CD823E4C2F10071FEC4 /* HapticEngineEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90884CD723E4C2F10071FEC4 /* HapticEngineEvent.swift */; }; - 90884CDB23E4C4CF0071FEC4 /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = 90884CDA23E4C4CF0071FEC4 /* SwiftyJSON */; }; + 90884CD823E4C2F10071FEC4 /* HapticEngineEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90884CD723E4C2F10071FEC4 /* HapticEngineEvent.swift */; platformFilter = ios; }; + 90884CDB23E4C4CF0071FEC4 /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = 90884CDA23E4C4CF0071FEC4 /* SwiftyJSON */; }; CE05603F1FB25CE200D06976 /* FreSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE05603E1FB25CE200D06976 /* FreSwift.framework */; platformFilter = ios; }; CE0560401FB25CE200D06976 /* FreSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE05603E1FB25CE200D06976 /* FreSwift.framework */; platformFilter = ios; }; CE0560431FB25D1B00D06976 /* SwiftController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0560411FB25D1B00D06976 /* SwiftController.swift */; platformFilter = ios; }; @@ -221,7 +221,7 @@ CE87F45D1FB259C9005CF7DF /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1120; + LastUpgradeCheck = 1210; ORGANIZATIONNAME = "Tua Rua Ltd"; TargetAttributes = { CE87F4741FB259DB005CF7DF = { @@ -348,6 +348,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -408,6 +409,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -475,6 +477,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -549,6 +552,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS",