Merge branch 'master' into new-underscore-version

tidev · May 17, 2022 · 009c33b · 009c33b
2 parents 5a06869 + 975ed42
commit 009c33b
Show file tree

Hide file tree

Showing 20 changed files with 143 additions and 175 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: tidev
+liberapay: tidev
diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml
@@ -8,6 +8,6 @@ jobs:
     name: Verify contributor
 
     steps:
-    - env:
-        GITHUB_USER: ${{ github.actor }}
-      uses: tidev/tidev-cla-action@v1
+    - uses: tidev/tidev-cla-action@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Alloy/alloy.js b/Alloy/alloy.js
@@ -1,6 +1,6 @@
 /**
  * Alloy
- * Copyright (c) 2012 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright TiDev, Inc. 04/07/2022-Present
  * See LICENSE for more information on licensing.
  */
 var program = require('commander'),

diff --git a/Alloy/commands/new/index.js b/Alloy/commands/new/index.js
@@ -109,7 +109,7 @@ module.exports = async function(args, program) {
 
 		} else {
 			logger.warn(`No package.json file exists in ${paths.project} so creating one`);
-			logger.warn('Please visit https://github.com/appcelerator/webpack-plugin-alloy#readme to make sure your project is fully up to date');
+			logger.warn('Please visit https://github.com/tidev/webpack-plugin-alloy#readme to make sure your project is fully up to date');
 			// specify this exact version of webpack as using a new version requires all things to be updated
 			pkg.devDependencies.webpack = '^4.43.0';
 			pkg.devDependencies.eslint = '^7.5.0';

diff --git a/Alloy/template/app.js b/Alloy/template/app.js
@@ -1,7 +1,7 @@
 /**
  * Alloy for Titanium by Appcelerator
  * This is generated code, DO NOT MODIFY - changes will be lost!
- * Copyright (c) 2012 by Appcelerator, Inc.
+ * Copyright TiDev, Inc. 04/07/2022-Present
  */
 var Alloy = require('/alloy'),
 	_ = Alloy._,

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 ======================================
 Alloy
-Copyright (c) 2012-2013 Appcelerator, Inc.
+Copyright TiDev, Inc. 04/07/2022-Present
 ======================================
 
    Licensed under the Apache License, Version 2.0 (the "License");
@@ -220,29 +220,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-
-
-PRIVACY NOTICE 
-==============
-
-At Appcelerator, we’re committed to transparency and we respect your privacy.
-This software collects information about you and your end-users of any
-applications that you build. The information we collect is used to 
-improve the content of our Products, Websites and Applications built using
-our technology (collectively and individually, the "Software"), used to 
-customize the content and/or layout of our Software for each individual 
-visitor, used to notify users about updates to our Software, used by us to 
-contact users for marketing purposes, disclosed when legally required to 
-do so, at the request of governmental authorities conducting an investigation, 
-to verify or enforce compliance with the policies governing our Software and 
-applicable laws or to protect against misuse or unauthorized use of our 
-Software, to a successor entity in connection with a corporate merger, 
-consolidation, sale of assets or other corporate change respecting the 
-Software.
-
-
-Please review the full text of our privacy policy online at:
-<http://www.appcelerator.com/company/privacy/>
-
-
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Alloy is an MVC application framework by [Appcelerator](http://www.appcelerator.
 
 * [Quick Start Guide](http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Framework) that covers _everything_ from installation to building your first app with Alloy.
 * Complete collection of [Alloy Guides](http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Framework)
-* [Collection of sample apps](https://github.com/appcelerator/alloy/tree/master/samples/apps) showing various aspects of Alloy in practice.
+* [Collection of sample apps](https://github.com/tidev/alloy/tree/master/samples/apps) showing various aspects of Alloy in practice.
 
 ## Installation
 
@@ -27,7 +27,7 @@ Alloy is an MVC application framework by [Appcelerator](http://www.appcelerator.
 [sudo] npm install -g alloy@1.4.1
 
 # install cutting edge directly from github
-[sudo] npm install -g git://github.com/appcelerator/alloy.git
+[sudo] npm install -g git://github.com/tidev/alloy.git
 ```
 
 ### from Axway Appcelerator Studio
@@ -36,7 +36,7 @@ Alloy is an MVC application framework by [Appcelerator](http://www.appcelerator.
 
 ## Running Sample Test Apps
 
-Alloy includes many sample and test apps in the **sample/apps** folder (see above). For example, [basics/simple](https://github.com/appcelerator/alloy/tree/master/samples/apps/basics/simple). You can run these in a few different ways:
+Alloy includes many sample and test apps in the **sample/apps** folder (see above). For example, [basics/simple](https://github.com/tidev/alloy/tree/master/samples/apps/basics/simple). You can run these in a few different ways:
 
 ### A) With a regular Alloy installation
 Beginning with Alloy 1.6, you can do the following:
@@ -54,7 +54,7 @@ alloy new . --testapp basics/simple
 
 ```bash
 # first, clone the repo
-git clone https://github.com/appcelerator/alloy.git
+git clone https://github.com/tidev/alloy.git
 cd alloy
 
 # install jake globally
@@ -76,14 +76,14 @@ You can use these apps through Titanium Studio too. The easiest way to do that w
 
 ## Additional Notes on Jake
 
-* See the [jake readme](https://github.com/appcelerator/alloy/blob/master/jakelib/readme.md) for  information on using `jake` including the arguments and flags it accepts.
+* See the [jake readme](https://github.com/tidev/alloy/blob/master/jakelib/readme.md) for  information on using `jake` including the arguments and flags it accepts.
 * on OSX or Linux
     * Try using `sudo` with the `jake` command if you run into permission errors.
 * on Windows
     * Don't run `jake` from within a user folder (i.e. `C:\Users\tony\alloy`), as you can get all kinds of non-obvious permissions failures from the child processing Alloy does. Your safest bet is to just `git clone` right to `C:\alloy`.
     * Node.js has [an issue piping output between node processes on Windows](https://github.com/joyent/node/issues/3584). I've tried to [workaround](https://github.com/joyent/node/issues/3584#issuecomment-23064579) as best I can. You may still see errors pop up, so it's suggested that if you run the automated testing via `jake test:all` or `npm test`, you do so on a non-Windows OS to ensure there's no red herring failures until the aforementioned node.js issue is resolved.
     * If you decide to ignore my advice and run the tests anyway on Windows, make sure that if you imported the Harness into TiStudio that you _don't_ have TiStudio running. Windows creates locks on key files in that project that are necessary for the testing process. It will make tests fail erroneously.
-    * If you're still that stubborn, are running the test suite on Windows, and you're getting those intermittent, erroneous errors, try running them one spec at a time. Instead of doing `jake test:all`, do `jake test:spec[SPEC_NAME]`, where `SPEC_NAME` is JS file in the [test specs folder](https://github.com/appcelerator/alloy/tree/master/test/specs).
+    * If you're still that stubborn, are running the test suite on Windows, and you're getting those intermittent, erroneous errors, try running them one spec at a time. Instead of doing `jake test:all`, do `jake test:spec[SPEC_NAME]`, where `SPEC_NAME` is JS file in the [test specs folder](https://github.com/tidev/alloy/tree/master/test/specs).
 
 ## Feedback
 
@@ -201,5 +201,4 @@ To protect the interests of the Alloy contributors, Appcelerator, customers and
 
 ## Legal
 
-Alloy is developed by Appcelerator and the community and is Copyright (c) 2012 by Appcelerator, Inc. All Rights Reserved.
-Alloy is made available under the Apache Public License, version 2.  See the [LICENSE](https://github.com/appcelerator/alloy/blob/master/LICENSE) file for more information.
+Titanium is a registered trademark of TiDev Inc. All Titanium trademark and patent rights were transferred and assigned to TiDev Inc. on 04/07/2022. Please see the LEGAL information about using our trademarks, privacy policy, terms of usage and other legal information at https://tidev.io/legal.
diff --git a/cli_config.json b/cli_config.json
@@ -2,13 +2,13 @@
 	"user": {
 		"locale": "en_US",
 		"name": "Travis Runner",
-		"email": "no-reply@appcelerator.com"
+		"email": "no-reply@tidev.io"
 	},
 	"app": {
 		"workspace": "",
 		"idprefix": "com.appcelerator",
-		"publisher": "Appcelerator Inc.",
-		"url": "http://appcelerator.com"
+		"publisher": "TiDev, Inc.",
+		"url": "https://tidev.io"
 	},
 	"cli": {
 		"colors": true,
@@ -49,4 +49,4 @@
 		"distributionName": "",
 		"autoSelectDevice": true
 	}
-}
+}
diff --git a/hooks/alloy.js b/hooks/alloy.js
@@ -1,6 +1,6 @@
 /**
  * Alloy
- * Copyright (c) 2012 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright TiDev, Inc. 04/07/2022-Present
  * See LICENSE for more information on licensing.
  */
 

diff --git a/hooks/deepclean.js b/hooks/deepclean.js
@@ -1,6 +1,6 @@
 /**
  * Alloy
- * Copyright (c) 2014 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright TiDev, Inc. 04/07/2022-Present
  * See LICENSE for more information on licensing.
  */
 

diff --git a/package.json b/package.json
@@ -1,8 +1,7 @@
 {
   "name": "alloy",
-  "description": "Appcelerator Titanium MVC Framework",
+  "description": "TiDev Titanium MVC Framework",
   "keywords": [
-    "appcelerator",
     "titanium",
     "alloy",
     "mobile",
@@ -13,19 +12,13 @@
     "appc-client"
   ],
   "version": "1.18.0",
-  "author": "Appcelerator, Inc. <info@appcelerator.com>",
-  "maintainers": [
-    {
-      "name": "Tony Lukasavage",
-      "email": "tlukasavage@appcelerator.com"
-    }
-  ],
+  "author": "TiDev, Inc. <npm@tidev.io>",
   "bugs": {
-    "url": "https://jira.appcelerator.org/browse/ALOY"
+    "url": "https://github.com/tidev/alloy/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/appcelerator/alloy.git"
+    "url": "git+https://github.com/tidev/alloy.git"
   },
   "preferGlobal": true,
   "dependencies": {

diff --git a/samples/apps/basics/builtins/README.md b/samples/apps/basics/builtins/README.md
@@ -3,7 +3,7 @@ Builtins
 
 In this example, we're going to show how we can use some of alloy's builtin JS libraries directly in your alloy JS files. These _builtins_ are meant to extend the base functionality of all your Titanium apps. The great thing about them is that only the builtins you need will be pulled into your generated Titanium project. The alloy compile process will survey your code and determine which builtins you will need at runtime.
 
-The existing list of builtins can be found at: [https://github.com/appcelerator/alloy/tree/master/Alloy/builtins](https://github.com/appcelerator/alloy/tree/master/Alloy/builtins)
+The existing list of builtins can be found at: [https://github.com/tidev/alloy/tree/master/Alloy/builtins](https://github.com/tidev/alloy/tree/master/Alloy/builtins)
 
 To use a builtin library in your code and have it automatically added to your generate Titanium project, all you need to do is require it with the `alloy` root diretory in your `require()` call. For example, if you wanted to include the `animation` builtin, all you need to do is this:
 

diff --git a/samples/apps/widgets/complex/widgets/com.appcelerator.loading/widget.json b/samples/apps/widgets/complex/widgets/com.appcelerator.loading/widget.json
@@ -4,11 +4,11 @@
 	"description" : "Cross-platform loading image",
 	"author": "Dawson Toth (alloy port by Tony Lukasavage)",
 	"version": "1.0",
-	"copyright":"Copyright (c) 2012 by Appcelerator",
+	"copyright":"Copyright TiDev, Inc. 04/07/2022-Present",
 	"license":"Public Domain",
 	"min-alloy-version": "0.1.16",
 	"min-titanium-version":"2.0",
 	"tags":"utility,loading,progress",
 	"platforms":"android,ios,mobileweb,windows",
 	"dependencies": {}
-}
+}
diff --git a/samples/apps/widgets/complex/widgets/com.testing.searchForBooks/widget.json b/samples/apps/widgets/complex/widgets/com.testing.searchForBooks/widget.json
@@ -4,7 +4,7 @@
 	"description" : "Google API Bok search",
 	"author": "Tony Lukasavage",
 	"version": "1.0",
-	"copyright":"Copyright (c) 2012 by Appcelerator",
+	"copyright":"Copyright TiDev, Inc. 04/07/2022-Present",
 	"license":"Public Domain",
 	"min-alloy-version": "0.1.16",
 	"min-titanium-version":"2.0",
@@ -14,4 +14,4 @@
 		"com.appcelerator.loading":"1.0"
 
 	}
-}
+}
diff --git a/test/apps/testing/ALOY-632/widgets/optionDialog/widget.json b/test/apps/testing/ALOY-632/widgets/optionDialog/widget.json
@@ -3,10 +3,10 @@
 	"description": "test widget",
 	"author": "",
 	"version": "0.1",
-	"copyright": "Copyright (c) 2012 by Appcelerator",
+	"copyright": "Copyright TiDev, Inc. 04/07/2022-Present",
 	"license": "Public Domain",
 	"min-alloy-version": "1.0.0",
 	"min-titanium-version": "3.0",
 	"tags": "utility",
 	"platforms": "android,ios,mobileweb"
-}
+}
diff --git a/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/widget.json b/test/apps/testing/ALOY-798/widgets/com.appcelerator.loading/widget.json
@@ -4,11 +4,11 @@
 	"description" : "Cross-platform loading image",
 	"author": "Dawson Toth (alloy port by Tony Lukasavage)",
 	"version": "1.0",
-	"copyright":"Copyright (c) 2012 by Appcelerator",
+	"copyright":"Copyright TiDev, Inc. 04/07/2022-Present",
 	"license":"Public Domain",
 	"min-alloy-version": "0.1.16",
 	"min-titanium-version":"2.0",
 	"tags":"utility,loading,progress",
 	"platforms":"android,ios,mobileweb",
 	"dependencies": {}
-}
+}
diff --git a/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/widget.json b/test/apps/testing/ALOY-898/widgets/com.appcelerator.loading/widget.json
@@ -4,11 +4,11 @@
 	"description" : "Cross-platform loading image",
 	"author": "Dawson Toth (alloy port by Tony Lukasavage)",
 	"version": "1.0",
-	"copyright":"Copyright (c) 2012 by Appcelerator",
+	"copyright":"Copyright TiDev, Inc. 04/07/2022-Present",
 	"license":"Public Domain",
 	"min-alloy-version": "0.1.16",
 	"min-titanium-version":"2.0",
 	"tags":"utility,loading,progress",
 	"platforms":"android,ios,mobileweb",
 	"dependencies": {}
-}
+}
diff --git a/test/projects/HarnessTemplate/LICENSE b/test/projects/HarnessTemplate/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2008-2012 Appcelerator, Inc.
+Copyright TiDev, Inc. 04/07/2022-Present
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/test/projects/HarnessTemplate/README b/test/projects/HarnessTemplate/README
@@ -1,4 +1,4 @@
-Welcome to your Appcelerator Titanium Mobile Project
+Welcome to your TiDev Titanium Mobile Project
 
 This is a blank project.  Start by editing your application's app.js to 
 make your first mobile project using Titanium.
@@ -8,10 +8,10 @@ make your first mobile project using Titanium.
 ----------------------------------
 Stuff our legal folk make us say:
 
-Appcelerator, Appcelerator Titanium and associated marks and logos are 
-trademarks of Appcelerator, Inc. 
+TiDev, TiDev Titanium and associated marks and logos are 
+trademarks of TiDev, Inc. 
 
-Titanium is Copyright (c) 2008-2012 by Appcelerator, Inc. All Rights Reserved.
+Titanium is Copyright TiDev, Inc. 04/07/2022-Present
 
 Titanium is licensed under the Apache Public License (Version 2). Please
 see the LICENSE file for the full license.