diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 15d6236d..40c81b3e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,10 +12,10 @@ on: jobs: android: - runs-on: macos-13 + runs-on: macos-15 name: Android env: - SDK_VERSION: 13.0.0.GA + SDK_VERSION: 13.1.1.GA steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 80d594b9..23c53a25 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -12,16 +12,16 @@ on: jobs: ios: - runs-on: macos-13 + runs-on: macos-15 name: iOS env: - SDK_VERSION: 13.0.0.GA + SDK_VERSION: 13.1.1.GA # This one uses Swift 3.8.1. If you're running into the "Unsupported Swift architecture", verify which # Swift version is used for the specified Ti SDK version, e.g. by looking into: # ~/Library/Application Support/Titanium/mobilesdk/osx//iphone/Frameworks/TitaniumKit.xcframework/ios-arm64/TitaniumKit.framework/Headers/TitaniumKit-Swift.h # # An overview of macOS <> Xcode <> Swift versions can be found here: https://developer.apple.com/support/xcode/ - DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer steps: - uses: actions/checkout@v4 diff --git a/android/hooks/build.gradle.ejs b/android/hooks/build.gradle.ejs index b953d5fd..a41adec3 100644 --- a/android/hooks/build.gradle.ejs +++ b/android/hooks/build.gradle.ejs @@ -15,12 +15,12 @@ repositories { // Android build settings for this library project. android { namespace '<%- moduleId %>' - compileSdkVersion <%- compileSdkVersion %> + compileSdk <%- compileSdkVersion %> defaultConfig { - minSdkVersion <%- minSdkVersion %> - targetSdkVersion <%- targetSdkVersion %> + minSdk <%- minSdkVersion %> + targetSdk <%- targetSdkVersion %> } - lintOptions { + lint { checkReleaseBuilds false } } @@ -53,12 +53,12 @@ task generateJarDependenciesFile() { // Add the main Android framework JAR to the collection. jarPathCollection.add( - file("${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar").toString()) + file('<%- sdkDir %>/platforms/android-<%- compileSdkVersion %>/android.jar').toString()) // Fetch JAR paths to all dependencies referenced by this gradle script and "./platform/android/build.gradle". - project.android.libraryVariants.all { variant -> - variant.getCompileClasspath(null).each { - def fileObject = it + def compileClasspath = configurations.findByName('compileClasspath') + if (compileClasspath != null) { + compileClasspath.files.each { fileObject -> def filePath = fileObject.toString() if (!filePath.startsWith(buildDir.toString()) && fileObject.exists()) { jarPathCollection.add(filePath) diff --git a/android/hooks/hyperloop.js b/android/hooks/hyperloop.js index ade7c7cf..24338617 100644 --- a/android/hooks/hyperloop.js +++ b/android/hooks/hyperloop.js @@ -167,6 +167,7 @@ exports.cliVersion = '>=3.2'; compileSdkVersion: this.builder.targetSDK, moduleId: this.builder.moduleId, minSdkVersion: this.builder.minSDK, + sdkDir: this.builder.androidInfo.sdk.path.replace(/\\/g, '\\\\'), targetSdkVersion: this.builder.targetSDK, tiMavenUrl: encodeURI('file://' + path.join(this.builder.platformPath, 'm2repository').replace(/\\/g, '/')), tiProjectPlatformAndroidDir: path.join(this.builder.projectDir, 'platform', 'android'), diff --git a/android/hooks/metabase/lib/commons-lang3-3.20.0.jar b/android/hooks/metabase/lib/commons-lang3-3.20.0.jar new file mode 100644 index 00000000..8682b86d Binary files /dev/null and b/android/hooks/metabase/lib/commons-lang3-3.20.0.jar differ diff --git a/android/manifest b/android/manifest index bb529e3c..e4f9e5be 100644 --- a/android/manifest +++ b/android/manifest @@ -15,4 +15,4 @@ name: hyperloop-android moduleid: hyperloop guid: bdaca69f-b316-4ce6-9065-7a61e1dafa39 platform: android -minsdk: 13.0.0 +minsdk: 13.2.0