Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove old code, fix sdk version, update action #1421

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

remove old code, fix sdk version, update action #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4170204
remove old code, fix sdk version, update action
m1ga Oct 1, 2024
479f529
node version
m1ga Oct 5, 2024
554fe03
ti version
m1ga Oct 7, 2024
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
17 changes: 8 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
Lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v1
- uses: actions/setup-node@v4
with:
node-version: '16.x'
node-version: '22.x'
- name: Install dependencies
run: npm ci
- name: Lint
Expand All @@ -28,23 +28,22 @@ jobs:
strategy:
fail-fast: false
matrix:
nodeVersion: [ '16.x' ]
nodeVersion: [ '22.x' ]
os: [ macos-latest ]
tiSDK: [ latest ]
tiSDK: [ 'latest' ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v1
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.nodeVersion }}
- name: Install dependencies
run: |
npm ci
npm i titanium -g
ti sdk install ${{ matrix.tiSDK }} -d
ti sdk install ${{ matrix.tiSDK }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Run tests
run: npm test

6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '22'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
Expand Down
13 changes: 2 additions & 11 deletions Alloy/commands/compile/parsers/Alloy.Abstract.FixedSpace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
var U = require('../../../utils'),
CU = require('../compilerUtils'),
tiapp = require('../../../tiapp'),
iOSProxy;

var MIN_VERSION = '5.4.0';
tiapp = require('../../../tiapp');

exports.parse = function(node, state) {
return require('./base').parse(node, state, parse);
Expand All @@ -13,18 +10,12 @@ function parse(node, state, args) {
// width is a valid property for a FIXED_SPACE button, add in if specified
var width = (args.createArgs.width) ? ", width:'" + args.createArgs.width + "'" : '';

if (tiapp.version.gte(tiapp.getSdkVersion(), MIN_VERSION)) {
iOSProxy = 'iOS';
} else {
iOSProxy = 'iPhone';
}

return {
parent: {
node: node,
symbol: args.symbol
},
styles: state.styles,
code: args.symbol + ' = Ti.UI.createButton({systemButton: Ti.UI.' + iOSProxy + '.SystemButton.FIXED_SPACE' + width + '});'
code: args.symbol + ' = Ti.UI.createButton({systemButton: Ti.UI.iOS.SystemButton.FIXED_SPACE' + width + '});'
};
}
13 changes: 2 additions & 11 deletions Alloy/commands/compile/parsers/Alloy.Abstract.FlexSpace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,19 @@
var U = require('../../../utils'),
CU = require('../compilerUtils'),
tiapp = require('../../../tiapp'),
iOSProxy;

var MIN_VERSION = '5.4.0';
tiapp = require('../../../tiapp');

exports.parse = function(node, state) {
return require('./base').parse(node, state, parse);
};

function parse(node, state, args) {

if (tiapp.version.gte(tiapp.getSdkVersion(), MIN_VERSION)) {
iOSProxy = 'iOS';
} else {
iOSProxy = 'iPhone';
}

return {
parent: {
node: node,
symbol: args.symbol
},
styles: state.styles,
code: args.symbol + ' = Ti.UI.createButton({systemButton: Ti.UI.' + iOSProxy + '.SystemButton.FLEXIBLE_SPACE});'
code: args.symbol + ' = Ti.UI.createButton({systemButton: Ti.UI.iOS.SystemButton.FLEXIBLE_SPACE});'
};
}
5 changes: 0 additions & 5 deletions Alloy/commands/compile/parsers/Ti.UI.AttributedString.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,11 @@ var _ = require('lodash'),
CU = require('../compilerUtils'),
tiapp = require('../../../tiapp');

var MIN_VERSION = '3.6.0';

exports.parse = function(node, state) {
return require('./base').parse(node, state, parse);
};

function parse(node, state, args) {
if (tiapp.version.lt(tiapp.getSdkVersion(), MIN_VERSION)) {
U.die('Ti.UI.AttributedString (line ' + node.lineNumber + ') requires Titanium 3.6.0+');
}

// Get label text from node text, if present
var nodeText = U.XML.getNodeText(node);
Expand Down
13 changes: 2 additions & 11 deletions Alloy/commands/compile/parsers/Ti.UI.Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ var _ = require('lodash'),
styler = require('../styler'),
CU = require('../compilerUtils'),
U = require('../../../utils'),
tiapp = require('../../../tiapp'),
iOSProxy;

var MIN_VERSION = '5.4.0';
tiapp = require('../../../tiapp');

var systemButtons = [
'ACTION', 'ACTIVITY', 'ADD', 'BOOKMARKS', 'CAMERA', 'CANCEL', 'COMPOSE', 'CONTACT_ADD',
Expand All @@ -25,15 +22,9 @@ function parse(node, state, args) {
state.extraStyle = styler.createVariableStyle('title', U.possibleMultilineString(U.trim(nodeText.replace(/'/g, "\\'"))));
}

if (tiapp.version.gte(tiapp.getSdkVersion(), MIN_VERSION)) {
iOSProxy = 'iOS';
} else {
iOSProxy = 'iPhone';
}

var systemButton = node.getAttribute('systemButton');
if (_.includes(systemButtons, systemButton)) {
node.setAttribute('systemButton', 'Ti.UI.' + iOSProxy + '.SystemButton.' + systemButton);
node.setAttribute('systemButton', 'Ti.UI.iOS.SystemButton.' + systemButton);
}

// Generate runtime code using default
Expand Down
15 changes: 0 additions & 15 deletions Alloy/commands/compile/parsers/Ti.UI.NavigationWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,13 @@ var _ = require('lodash'),
CU = require('../compilerUtils'),
tiapp = require('../../../tiapp');

const MIN_VERSION_FOR_IOS = '3.1.3';
const MIN_VERSION = '8.0.0';
const MIN_ANDROID_TABGROUP_CHILD = '8.3.0';

exports.parse = function(node, state) {
return require('./base').parse(node, state, parse);
};

function parse(node, state, args) {
const tiappSdkVersion = tiapp.getSdkVersion();
const platform = CU.getCompilerConfig().alloyConfig.platform;
if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION_FOR_IOS)) {
U.die(`Ti.UI.iOS.NavigationWindow (line ${node.lineNumber}) requires Titanium ${MIN_VERSION_FOR_IOS}+`);
}

if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION)) {
node.setAttribute('ns', 'Ti.UI.iOS');
}

var children = U.XML.getElementsFromNodes(node.childNodes),
err = ['NavigationWindow must have only one child element, which must be a Window or TabGroup'],
Expand All @@ -37,10 +26,6 @@ function parse(node, state, args) {
theNode = CU.validateNodeName(child, [ 'Ti.UI.Window', 'Ti.UI.TabGroup' ]),
windowSymbol;

if (platform === 'android' && theNode === 'Ti.UI.TabGroup' && tiapp.version.lt(tiappSdkVersion, MIN_ANDROID_TABGROUP_CHILD)) {
U.die(`TabGroup can only be a child of a NavigationWindow on Android from SDK ${MIN_ANDROID_TABGROUP_CHILD} onwards. Current SDK is ${tiappSdkVersion}`);
}

// generate the code for the child first
if (theNode) {
code += CU.generateNodeExtended(child, state, {
Expand Down
5 changes: 0 additions & 5 deletions Alloy/commands/compile/parsers/Ti.UI.OptionBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
const _ = require('lodash');
const tiapp = require('../../../tiapp');
const U = require('../../../utils');
const MIN_VERSION = '10.0.0';

exports.parse = function(node, state) {
const tiappSdkVersion = tiapp.getSdkVersion();
if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION)) {
U.die(`Ti.UI.OptionBar requires Titanium SDK ${MIN_VERSION}+`);
}
return require('./Ti.UI.ButtonBar').parse(node, state);
};
9 changes: 0 additions & 9 deletions Alloy/commands/compile/parsers/Ti.UI.TabbedBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
const tiapp = require('../../../tiapp');
const CU = require('../compilerUtils');
const U = require('../../../utils');
const MIN_VERSION = '8.0.0';

exports.parse = function(node, state) {
const tiappSdkVersion = tiapp.getSdkVersion();
if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION)) {
const platform = CU.getCompilerConfig().alloyConfig.platform;
if (platform !== 'ios') {
U.die(`Ti.UI.TabbedBar for ${platform} requires Titanium ${MIN_VERSION}+`);
}
node.setAttribute('ns', 'Ti.UI.iOS');
}
return require('./Ti.UI.ButtonBar').parse(node, state);
};
6 changes: 0 additions & 6 deletions Alloy/commands/compile/parsers/Ti.UI.Toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ var _ = require('lodash'),

exports.parse = function(node, state) {
var platform = CU.getCompilerConfig().alloyConfig.platform;
if (tiapp.version.lt(tiapp.getSdkVersion(), '6.2.0')) {
if (platform !== 'ios') {
U.die('Ti.UI.Toolbar requires Titanium 6.2.0+');
}
node.setAttribute('ns', 'Ti.UI.iOS');
}

var eventObject = 'e',
code = '',
Expand Down
58 changes: 0 additions & 58 deletions Alloy/commands/compile/parsers/Ti.UI.iPhone.NavigationGroup.js
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions Alloy/tiapp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,10 @@ tiapp.getSdkVersion = function() {
} else {
if (process.env.sdk) {
return process.env.sdk;
} else {
return getSdkSelectVersion();
}
}
};
function getSdkSelectVersion() {
var homeDir = process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'],
file = path.join(homeDir, '.titanium', 'config.json');
if (!fs.existsSync(file)) {
U.die('Titanium configuration file does not exist at "' + file + '"');
}
var ticonfig = JSON.parse(fs.readFileSync(file, {encoding: 'utf8'}));
return ticonfig.sdk.selected;
}


// Get the value of a property from the tiapp.xml
tiapp.getProperty = function(name) {
Expand Down
Loading