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
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/<version>/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

Expand Down
16 changes: 8 additions & 8 deletions android/hooks/build.gradle.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions android/hooks/hyperloop.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading