diff --git a/.travis.yml b/.travis.yml index e28ba79c20..8df4987847 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ env: - NATIVESCRIPT_SKIP_POSTINSTALL_TASKS=1 language: node_js node_js: -- '6' +- '8' git: submodules: true install: diff --git a/docs/man_pages/lib-management/plugin-build.md b/docs/man_pages/lib-management/plugin-build.md new file mode 100644 index 0000000000..1dc713f3f6 --- /dev/null +++ b/docs/man_pages/lib-management/plugin-build.md @@ -0,0 +1,28 @@ +<% if (isJekyll) { %>--- +title: tns plugin build +position: 8 +---<% } %> +# tns plugin build +========== + +Usage | Synopsis +------|------- +General | `$ tns plugin build` + +<% if(isConsole) { %>Attempts to build the plugin's Android-specific project files located in `platforms/android`. Strips and removes `include.gradle` flavor declarations, if any are present. <% } %> +<% if(isHtml) { %>Attempts to build the plugin's Android-specific project files located in `platforms/android`. The resulting Android Library (aar), and the generated Android Gradle project used to build the library can be found at `platforms/android`. Also strips and removes `include.gradle` flavor declarations, if any are present. For more information about working with plugins, see [NativeScript Plugins](https://github.com/NativeScript/nativescript-cli/blob/master/PLUGINS.md).<% } %> + + +<% if(isHtml) { %> +### Prerequisites + +* Verify that the command is being executed in the source directory of a plugin - e.g. `nativescript-barcodescanner/src` + +### Related Commands + +Command | Description +----------|---------- +[plugin](plugin.html) | Lets you manage the plugins for your project. +[plugin install](plugin-install.html) | Installs the specified plugin and its dependencies. +[plugin remove](plugin-remove.html) | Uninstalls the specified plugin and its dependencies. +<% } %> diff --git a/docs/man_pages/lib-management/plugin.md b/docs/man_pages/lib-management/plugin.md index c361007deb..6b37973b6e 100644 --- a/docs/man_pages/lib-management/plugin.md +++ b/docs/man_pages/lib-management/plugin.md @@ -19,6 +19,7 @@ Lets you manage the plugins for your project. * `update` - Uninstalls and installs the specified plugin(s) and its dependencies. * `find` - Finds NativeScript plugins in npm. * `search` - Finds NativeScript plugins in npm. +* `build` - Builds the Android parts of a NativeScript plugin. <% if(isHtml) { %> ### Related Commands @@ -28,4 +29,5 @@ Command | Description [plugin add](plugin-add.html) | Installs the specified plugin and its dependencies. [plugin remove](plugin-remove.html) | Uninstalls the specified plugin and its dependencies. [plugin update](plugin-update.html) | Updates the specified plugin(s) and its dependencies. +[plugin build](plugin-build.html) | Builds the Android project of a NativeScript plugin, and updates the `include.gradle`. <% } %> diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts index 3f9136eaec..e8b7aade76 100644 --- a/lib/bootstrap.ts +++ b/lib/bootstrap.ts @@ -9,6 +9,7 @@ $injector.require("projectData", "./project-data"); $injector.requirePublic("projectDataService", "./services/project-data-service"); $injector.requirePublic("projectService", "./services/project-service"); $injector.require("androidProjectService", "./services/android-project-service"); +$injector.require("androidPluginBuildService", "./services/android-plugin-build-service"); $injector.require("iOSEntitlementsService", "./services/ios-entitlements-service"); $injector.require("iOSProjectService", "./services/ios-project-service"); $injector.require("iOSProvisionService", "./services/ios-provision-service"); @@ -90,6 +91,7 @@ $injector.requireCommand("plugin|add", "./commands/plugin/add-plugin"); $injector.requireCommand("plugin|install", "./commands/plugin/add-plugin"); $injector.requireCommand("plugin|remove", "./commands/plugin/remove-plugin"); $injector.requireCommand("plugin|update", "./commands/plugin/update-plugin"); +$injector.requireCommand("plugin|build", "./commands/plugin/build-plugin"); $injector.require("doctorService", "./services/doctor-service"); $injector.require("xcprojService", "./services/xcproj-service"); diff --git a/lib/commands/plugin/build-plugin.ts b/lib/commands/plugin/build-plugin.ts new file mode 100644 index 0000000000..c4e4486fce --- /dev/null +++ b/lib/commands/plugin/build-plugin.ts @@ -0,0 +1,62 @@ +import { EOL } from "os"; +import * as path from "path"; +import * as constants from "../../constants"; +export class BuildPluginCommand implements ICommand { + public allowedParameters: ICommandParameter[] = []; + public pluginProjectPath: string; + + constructor(private $androidPluginBuildService: IAndroidPluginBuildService, + private $errors: IErrors, + private $logger: ILogger, + private $fs: IFileSystem, + private $options: IOptions) { + + this.pluginProjectPath = path.resolve(this.$options.path || "."); + } + + public async execute(args: string[]): Promise { + const platformsAndroidPath = path.join(this.pluginProjectPath, constants.PLATFORMS_DIR_NAME, "android"); + let pluginName = ""; + + const pluginPackageJsonPath = path.join(this.pluginProjectPath, constants.PACKAGE_JSON_FILE_NAME); + + if (this.$fs.exists(pluginPackageJsonPath)) { + const packageJsonContents = this.$fs.readJson(pluginPackageJsonPath); + + if (packageJsonContents && packageJsonContents["name"]) { + pluginName = packageJsonContents["name"]; + } + } + + const tempAndroidProject = path.join(platformsAndroidPath, "android-project"); + + const options: IBuildOptions = { + aarOutputDir: platformsAndroidPath, + platformsAndroidDirPath: platformsAndroidPath, + pluginName: pluginName, + tempPluginDirPath: tempAndroidProject + }; + + const androidPluginBuildResult = await this.$androidPluginBuildService.buildAar(options); + + if (androidPluginBuildResult) { + this.$logger.info(`${pluginName} successfully built aar at ${platformsAndroidPath}.${EOL}Temporary Android project can be found at ${tempAndroidProject}.`); + } + + const migratedIncludeGradle = this.$androidPluginBuildService.migrateIncludeGradle(options); + + if (migratedIncludeGradle) { + this.$logger.info(`${pluginName} include gradle updated.`); + } + } + + public async canExecute(args: string[]): Promise { + if (!this.$fs.exists(path.join(this.pluginProjectPath, constants.PLATFORMS_DIR_NAME, "android"))) { + this.$errors.failWithoutHelp("No plugin found at the current directory, or the plugin does not need to have its platforms/android components built into an `.aar`."); + } + + return true; + } +} + +$injector.registerCommand("plugin|build", BuildPluginCommand); diff --git a/lib/common b/lib/common index 68f737df29..a8b2bc8981 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit 68f737df297b58bf80f74de0172cf2ac0a1273b8 +Subproject commit a8b2bc8981f37bbe36a7a08507b0cd980913c091 diff --git a/lib/constants.ts b/lib/constants.ts index 3b1f6a1d73..541257e602 100644 --- a/lib/constants.ts +++ b/lib/constants.ts @@ -24,6 +24,7 @@ export const SRC_DIR = "src"; export const MAIN_DIR = "main"; export const ASSETS_DIR = "assets"; export const MANIFEST_FILE_NAME = "AndroidManifest.xml"; +export const INCLUDE_GRADLE_NAME = "include.gradle"; export const BUILD_DIR = "build"; export const OUTPUTS_DIR = "outputs"; export const APK_DIR = "apk"; @@ -31,6 +32,7 @@ export const RESOURCES_DIR = "res"; export const CONFIG_NS_FILE_NAME = "nsconfig.json"; export const CONFIG_NS_APP_RESOURCES_ENTRY = "appResourcesPath"; export const CONFIG_NS_APP_ENTRY = "appPath"; +export const DEPENDENCIES_JSON_NAME = "dependencies.json"; export class PackageVersion { static NEXT = "next"; diff --git a/lib/definitions/android-plugin-migrator.d.ts b/lib/definitions/android-plugin-migrator.d.ts new file mode 100644 index 0000000000..fbbd73246e --- /dev/null +++ b/lib/definitions/android-plugin-migrator.d.ts @@ -0,0 +1,15 @@ + +interface IBuildOptions extends IAndroidBuildOptions{ +} + +interface IAndroidBuildOptions { + platformsAndroidDirPath: string, + pluginName: string, + aarOutputDir: string, + tempPluginDirPath: string +} + +interface IAndroidPluginBuildService { + buildAar(options: IBuildOptions): Promise; + migrateIncludeGradle(options: IBuildOptions): boolean; +} diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts index ce2e479701..cc0ee62403 100644 --- a/lib/definitions/project.d.ts +++ b/lib/definitions/project.d.ts @@ -297,6 +297,26 @@ interface IPlatformProjectService extends NodeJS.EventEmitter { * If there are parts in the project that are inconsistent with the desired options, marks them in the changeset flags. */ checkForChanges(changeset: IProjectChangesInfo, options: IProjectChangesOptions, projectData: IProjectData): Promise; + + /** + * Build native part of a nativescript plugins if necessary + */ + prebuildNativePlugin(buildOptions: IBuildOptions): Promise; + + /** + * Traverse through the production dependencies and find plugins that need build/rebuild + */ + checkIfPluginsNeedBuild(projectData: IProjectData): Promise>; + + /** + * Get gradle options the CLI generates when building project + */ + getBuildOptions(configurationFilePath?: string): Array; + + /** + * Get gradle options the CLI generates when building project + */ + executeCommand(projectRoot: string, args: any, childProcessOpts?: any, spawnFromEventOptions?: ISpawnFromEventOptions): Promise; } interface IAndroidProjectPropertiesManager { diff --git a/lib/project-data.ts b/lib/project-data.ts index 250557cf04..8830727a9c 100644 --- a/lib/project-data.ts +++ b/lib/project-data.ts @@ -152,6 +152,10 @@ export class ProjectData implements IProjectData { } private getNsConfigContent(projectDir: string): string { + if (!projectDir) { + return null; + } + const configNSFilePath = path.join(projectDir, constants.CONFIG_NS_FILE_NAME); if (!this.$fs.exists(configNSFilePath)) { diff --git a/lib/services/android-plugin-build-service.ts b/lib/services/android-plugin-build-service.ts new file mode 100644 index 0000000000..ca2c6dc926 --- /dev/null +++ b/lib/services/android-plugin-build-service.ts @@ -0,0 +1,354 @@ +import * as path from "path"; +import { MANIFEST_FILE_NAME, INCLUDE_GRADLE_NAME, ASSETS_DIR, RESOURCES_DIR } from "../constants"; +import { Builder, parseString } from "xml2js"; +import { ILogger } from "log4js"; + +export class AndroidPluginBuildService implements IAndroidPluginBuildService { + + constructor(private $fs: IFileSystem, + private $childProcess: IChildProcess, + private $hostInfo: IHostInfo, + private $androidToolsInfo: IAndroidToolsInfo, + private $logger: ILogger) { } + + private static MANIFEST_ROOT = { + $: { + "xmlns:android": "http://schemas.android.com/apk/res/android" + } + }; + private static ANDROID_PLUGIN_GRADLE_TEMPLATE = "../../vendor/gradle-plugin"; + + private getAndroidSourceDirectories(source: string): Array { + const directories = [RESOURCES_DIR, "java", ASSETS_DIR, "jniLibs"]; + const resultArr: Array = []; + + this.$fs.enumerateFilesInDirectorySync(source, (file, stat) => { + if (stat.isDirectory() && _.some(directories, (element) => file.endsWith(element))) { + resultArr.push(file); + return true; + } + }); + + return resultArr; + } + + private getManifest(platformsDir: string): string { + const manifest = path.join(platformsDir, MANIFEST_FILE_NAME); + return this.$fs.exists(manifest) ? manifest : null; + } + + private getShortPluginName(pluginName: string): string { + return pluginName.replace(/[\-]/g, "_"); + } + + private async updateManifestContent(oldManifestContent: string, defaultPackageName: string): Promise { + let xml: any = await this.getXml(oldManifestContent); + + let packageName = defaultPackageName; + // if the manifest file is full-featured and declares settings inside the manifest scope + if (xml["manifest"]) { + if (xml["manifest"]["$"]["package"]) { + packageName = xml["manifest"]["$"]["package"]; + } + + // set the xml as the value to iterate over its properties + xml = xml["manifest"]; + } + + // if the manifest file doesn't have a scope, only the first setting will be picked up + const newManifest: any = { manifest: {} }; + for (const prop in xml) { + newManifest.manifest[prop] = xml[prop]; + } + + newManifest.manifest["$"]["package"] = packageName; + + const xmlBuilder = new Builder(); + const newManifestContent = xmlBuilder.buildObject(newManifest); + + return newManifestContent; + } + + private createManifestContent(packageName: string): string { + const newManifest: any = { manifest: AndroidPluginBuildService.MANIFEST_ROOT }; + newManifest.manifest["$"]["package"] = packageName; + const xmlBuilder: any = new Builder(); + const newManifestContent = xmlBuilder.buildObject(newManifest); + + return newManifestContent; + } + + private async getXml(stringContent: string): Promise { + const promise = new Promise((resolve, reject) => + parseString(stringContent, (err: any, result: any) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }) + ); + + return promise; + } + + private getIncludeGradleCompileDependenciesScope(includeGradleFileContent: string): Array { + const indexOfDependenciesScope = includeGradleFileContent.indexOf("dependencies"); + const result: Array = []; + + if (indexOfDependenciesScope === -1) { + return result; + } + + const indexOfRepositoriesScope = includeGradleFileContent.indexOf("repositories"); + + let repositoriesScope = ""; + if (indexOfRepositoriesScope >= 0) { + repositoriesScope = this.getScope("repositories", includeGradleFileContent); + result.push(repositoriesScope); + } + + const dependenciesScope = this.getScope("dependencies", includeGradleFileContent); + result.push(dependenciesScope); + + return result; + } + + private getScope(scopeName: string, content: string): string { + const indexOfScopeName = content.indexOf(scopeName); + let result = ""; + const openingBracket = "{"; + const closingBracket = "}"; + let openBrackets = 0; + let foundFirstBracket = false; + + let i = indexOfScopeName; + while (i < content.length) { + const currCharacter = content[i]; + if (currCharacter === openingBracket) { + if (openBrackets === 0) { + foundFirstBracket = true; + } + + openBrackets++; + } + + if (currCharacter === closingBracket) { + openBrackets--; + } + + result += currCharacter; + + if (openBrackets === 0 && foundFirstBracket) { + break; + } + + i++; + } + + return result; + } + + /** + * Returns whether the build has completed or not + * @param {Object} options + * @param {string} options.pluginName - The name of the plugin. E.g. 'nativescript-barcodescanner' + * @param {string} options.platformsAndroidDirPath - The path to the 'plugin/src/platforms/android' directory. + * @param {string} options.aarOutputDir - The path where the aar should be copied after a successful build. + * @param {string} options.tempPluginDirPath - The path where the android plugin will be built. + */ + public async buildAar(options: IBuildOptions): Promise { + this.validateOptions(options); + + // IDEA: Accept as an additional parameter the Android Support Library version from CLI, pass it on as -PsupportVersion later to the build + // IDEA: apply app.gradle here in order to get any and all user-defined variables + // IDEA: apply the entire include.gradle here instead of copying over the repositories {} and dependencies {} scopes + + const shortPluginName = this.getShortPluginName(options.pluginName); + const newPluginDir = path.join(options.tempPluginDirPath, shortPluginName); + const newPluginMainSrcDir = path.join(newPluginDir, "src", "main"); + const defaultPackageName = "org.nativescript." + shortPluginName; + + // find manifest file + //// prepare manifest file content + const manifestFilePath = this.getManifest(options.platformsAndroidDirPath); + let shouldBuildAar = false; + + // look for AndroidManifest.xml + if (manifestFilePath) { + shouldBuildAar = true; + } + + // look for android resources + const androidSourceSetDirectories = this.getAndroidSourceDirectories(options.platformsAndroidDirPath); + + if (androidSourceSetDirectories.length > 0) { + shouldBuildAar = true; + } + + // if a manifest OR/AND resource files are present - write files, build plugin + if (shouldBuildAar) { + let updatedManifestContent; + this.$fs.ensureDirectoryExists(newPluginMainSrcDir); + + if (manifestFilePath) { + let androidManifestContent; + try { + androidManifestContent = this.$fs.readText(manifestFilePath); + } catch (err) { + throw new Error( + `Failed to fs.readFileSync the manifest file located at ${manifestFilePath}` + ); + } + + updatedManifestContent = await this.updateManifestContent(androidManifestContent, defaultPackageName); + } else { + updatedManifestContent = this.createManifestContent(defaultPackageName); + } + + // write the AndroidManifest in the temp-dir/plugin-name/src/main + const pathToNewAndroidManifest = path.join(newPluginMainSrcDir, MANIFEST_FILE_NAME); + try { + this.$fs.writeFile(pathToNewAndroidManifest, updatedManifestContent); + } catch (e) { + throw new Error(`Failed to write the updated AndroidManifest in the new location - ${pathToNewAndroidManifest}`); + } + + // copy all android sourceset directories to the new temporary plugin dir + for (const dir of androidSourceSetDirectories) { + // get only the last subdirectory of the entire path string. e.g. 'res', 'java', etc. + const dirNameParts = dir.split(path.sep); + const dirName = dirNameParts[dirNameParts.length - 1]; + + const destination = path.join(newPluginMainSrcDir, dirName); + this.$fs.ensureDirectoryExists(destination); + + this.$fs.copyFile(path.join(dir, "*"), destination); + } + + // copy the preconfigured gradle android library project template to the temporary android library + this.$fs.copyFile(path.join(path.resolve(path.join(__dirname, AndroidPluginBuildService.ANDROID_PLUGIN_GRADLE_TEMPLATE), "*")), newPluginDir); + + // sometimes the AndroidManifest.xml or certain resources in /res may have a compile dependency to a library referenced in include.gradle. Make sure to compile the plugin with a compile dependency to those libraries + const includeGradlePath = path.join(options.platformsAndroidDirPath, INCLUDE_GRADLE_NAME); + if (this.$fs.exists(includeGradlePath)) { + const includeGradleContent = this.$fs.readText(includeGradlePath); + const repositoriesAndDependenciesScopes = this.getIncludeGradleCompileDependenciesScope(includeGradleContent); + + // dependencies { } object was found - append dependencies scope + if (repositoriesAndDependenciesScopes.length > 0) { + const buildGradlePath = path.join(newPluginDir, "build.gradle"); + this.$fs.appendFile(buildGradlePath, "\n" + repositoriesAndDependenciesScopes.join("\n")); + } + } + + // finally build the plugin + const gradlew = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew"; + const localArgs = [ + gradlew, + "-p", + newPluginDir, + "assembleRelease" + ]; + + this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true }); + + const androidToolsInfo = this.$androidToolsInfo.getToolsInfo(); + const compileSdk = androidToolsInfo.compileSdkVersion; + const buildToolsVersion = androidToolsInfo.buildToolsVersion; + + localArgs.push(`-PcompileSdk=android-${compileSdk}`); + localArgs.push(`-PbuildToolsVersion=${buildToolsVersion}`); + + try { + await this.$childProcess.exec(localArgs.join(" "), { cwd: newPluginDir }); + } catch (err) { + throw new Error(`Failed to build plugin ${options.pluginName} : \n${err}`); + } + + const finalAarName = `${shortPluginName}-release.aar`; + const pathToBuiltAar = path.join(newPluginDir, "build", "outputs", "aar", finalAarName); + + if (this.$fs.exists(pathToBuiltAar)) { + try { + if (options.aarOutputDir) { + this.$fs.copyFile(pathToBuiltAar, path.join(options.aarOutputDir, `${shortPluginName}.aar`)); + } + } catch (e) { + throw new Error(`Failed to copy built aar to destination. ${e.message}`); + } + + return true; + } else { + throw new Error(`No built aar found at ${pathToBuiltAar}`); + } + } + + return false; + } + + /** + * @param {Object} options + * @param {string} options.platformsAndroidDirPath - The path to the 'plugin/src/platforms/android' directory. + */ + public migrateIncludeGradle(options: IBuildOptions): boolean { + this.validatePlatformsAndroidDirPathOption(options); + + const includeGradleFilePath = path.join(options.platformsAndroidDirPath, INCLUDE_GRADLE_NAME); + + if (this.$fs.exists(includeGradleFilePath)) { + let includeGradleFileContent: string; + try { + includeGradleFileContent = this.$fs.readFile(includeGradleFilePath).toString(); + } catch (err) { + throw new Error(`Failed to fs.readFileSync the include.gradle file located at ${includeGradleFilePath}`); + } + + const productFlavorsScope = this.getScope("productFlavors", includeGradleFileContent); + + try { + const newIncludeGradleFileContent = includeGradleFileContent.replace(productFlavorsScope, ""); + this.$fs.writeFile(includeGradleFilePath, newIncludeGradleFileContent); + + return true; + } catch (e) { + throw new Error(`Failed to write the updated include.gradle in - ${includeGradleFilePath}`); + } + } + + return false; + } + + private validateOptions(options: IBuildOptions): void { + if (!options) { + throw new Error("Android plugin cannot be built without passing an 'options' object."); + } + + if (!options.pluginName) { + this.$logger.info("No plugin name provided, defaulting to 'myPlugin'."); + } + + if (!options.aarOutputDir) { + this.$logger.info("No aarOutputDir provided, defaulting to the build outputs directory of the plugin"); + } + + if (!options.tempPluginDirPath) { + throw new Error("Android plugin cannot be built without passing the path to a directory where the temporary project should be built."); + } + + this.validatePlatformsAndroidDirPathOption(options); + } + + private validatePlatformsAndroidDirPathOption(options: IBuildOptions): void { + if (!options) { + throw new Error("Android plugin cannot be built without passing an 'options' object."); + } + + if (!options.platformsAndroidDirPath) { + throw new Error("Android plugin cannot be built without passing the path to the platforms/android dir."); + } + } + +} + +$injector.register("androidPluginBuildService", AndroidPluginBuildService); diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts index ae026b8f94..d0073652a2 100644 --- a/lib/services/android-project-service.ts +++ b/lib/services/android-project-service.ts @@ -4,8 +4,8 @@ import * as constants from "../constants"; import * as semver from "semver"; import * as projectServiceBaseLib from "./platform-project-service-base"; import { DeviceAndroidDebugBridge } from "../common/mobile/android/device-android-debug-bridge"; -import { attachAwaitDetach } from "../common/helpers"; import { EOL } from "os"; +import { attachAwaitDetach, isRecommendedAarFile } from "../common/helpers"; import { Configurations } from "../common/constants"; import { SpawnOptions } from "child_process"; @@ -36,7 +36,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject private $injector: IInjector, private $pluginVariablesService: IPluginVariablesService, private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants, - private $npm: INodePackageManager) { + private $npm: INodePackageManager, + private $androidPluginBuildService: IAndroidPluginBuildService) { super($fs, $projectDataService); this._androidProjectPropertiesManagers = Object.create(null); this.isAndroidStudioTemplate = false; @@ -318,7 +319,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject public async buildProject(projectRoot: string, projectData: IProjectData, buildConfig: IBuildConfig): Promise { if (this.canUseGradle(projectData)) { - const buildOptions = this.getBuildOptions(buildConfig, projectData); + const buildOptions = this.getGradleBuildOptions(buildConfig, projectData); if (this.$logger.getLevel() === "TRACE") { buildOptions.unshift("--stacktrace"); buildOptions.unshift("--debug"); @@ -336,7 +337,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject await attachAwaitDetach(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, handler, - this.executeGradleCommand(this.getPlatformData(projectData).projectRoot, + this.executeCommand(this.getPlatformData(projectData).projectRoot, buildOptions, { stdio: buildConfig.buildOutputStdio || "inherit" }, { emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: true })); @@ -346,12 +347,28 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject } } - private getBuildOptions(settings: IAndroidBuildOptionsSettings, projectData: IProjectData): Array { + private getGradleBuildOptions(settings: IAndroidBuildOptionsSettings, projectData: IProjectData): Array { + const configurationFilePath = this.getPlatformData(projectData).configurationFilePath; + + const buildOptions: Array = this.getBuildOptions(configurationFilePath); + + if (settings.release) { + buildOptions.push("-Prelease"); + buildOptions.push(`-PksPath=${path.resolve(settings.keyStorePath)}`); + buildOptions.push(`-Palias=${settings.keyStoreAlias}`); + buildOptions.push(`-Ppassword=${settings.keyStoreAliasPassword}`); + buildOptions.push(`-PksPassword=${settings.keyStorePassword}`); + } + + return buildOptions; + } + + public getBuildOptions(configurationFilePath?: string): Array { this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true }); const androidToolsInfo = this.$androidToolsInfo.getToolsInfo(); const compileSdk = androidToolsInfo.compileSdkVersion; - const targetSdk = this.getTargetFromAndroidManifest(projectData) || compileSdk; + const targetSdk = this.getTargetFromAndroidManifest(configurationFilePath) || compileSdk; const buildToolsVersion = androidToolsInfo.buildToolsVersion; const appCompatVersion = androidToolsInfo.supportRepositoryVersion; const generateTypings = androidToolsInfo.generateTypings; @@ -363,14 +380,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject `-PgenerateTypings=${generateTypings}` ]; - if (settings.release) { - buildOptions.push("-Prelease"); - buildOptions.push(`-PksPath=${path.resolve(settings.keyStorePath)}`); - buildOptions.push(`-Palias=${settings.keyStoreAlias}`); - buildOptions.push(`-Ppassword=${settings.keyStoreAliasPassword}`); - buildOptions.push(`-PksPassword=${settings.keyStorePassword}`); - } - return buildOptions; } @@ -413,14 +422,89 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject } public async preparePluginNativeCode(pluginData: IPluginData, projectData: IProjectData): Promise { - if (!this.shouldUseNewRuntimeGradleRoutine(projectData)) { + if (!this.runtimeVersionIsGreaterThanOrEquals(projectData, "3.3.0")) { const pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME); await this.processResourcesFromPlugin(pluginData, pluginPlatformsFolderPath, projectData); + } else if (this.runtimeVersionIsGreaterThanOrEquals(projectData, "4.0.0")) { + // build Android plugins which contain AndroidManifest.xml and/or resources + const pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME); + if (this.$fs.exists(pluginPlatformsFolderPath)) { + const options: IBuildOptions = { + pluginName: pluginData.name, + platformsAndroidDirPath: pluginPlatformsFolderPath, + aarOutputDir: pluginPlatformsFolderPath, + tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin") + }; + + await this.prebuildNativePlugin(options); + } } // Do nothing, the Android Gradle script will configure itself based on the input dependencies.json } + public async checkIfPluginsNeedBuild(projectData: IProjectData): Promise> { + const detectedPlugins: Array<{ platformsAndroidDirPath: string, pluginName: string }> = []; + + const platformsAndroid = path.join(constants.PLATFORMS_DIR_NAME, "android"); + const pathToPlatformsAndroid = path.join(projectData.projectDir, platformsAndroid); + const dependenciesJson = await this.$fs.readJson(path.join(pathToPlatformsAndroid, constants.DEPENDENCIES_JSON_NAME)); + const productionDependencies = dependenciesJson.map((item: any) => { + return path.resolve(pathToPlatformsAndroid, item.directory); + }); + + for (const dependency of productionDependencies) { + const jsonContent = this.$fs.readJson(path.join(dependency, constants.PACKAGE_JSON_FILE_NAME)); + const isPlugin = !!jsonContent.nativescript; + const pluginName = jsonContent.name; + if (isPlugin) { + const platformsAndroidDirPath = path.join(dependency, platformsAndroid); + if (this.$fs.exists(platformsAndroidDirPath)) { + let hasGeneratedAar = false; + let generatedAarPath = ""; + const nativeFiles = this.$fs.enumerateFilesInDirectorySync(platformsAndroidDirPath).filter((item) => { + if (isRecommendedAarFile(item, pluginName)) { + generatedAarPath = item; + hasGeneratedAar = true; + } + return this.isAllowedFile(item); + }); + + if (hasGeneratedAar) { + const aarStat = this.$fs.getFsStats(generatedAarPath); + nativeFiles.forEach((item) => { + const currentItemStat = this.$fs.getFsStats(item); + if (currentItemStat.mtime > aarStat.mtime) { + detectedPlugins.push({ + platformsAndroidDirPath, + pluginName + }); + } + }); + } else if (nativeFiles.length > 0) { + detectedPlugins.push({ + platformsAndroidDirPath, + pluginName + }); + } + } + } + } + return detectedPlugins; + } + + private isAllowedFile(item: string): boolean { + return item.endsWith(constants.MANIFEST_FILE_NAME) || item.endsWith(constants.RESOURCES_DIR); + } + + public async prebuildNativePlugin(options: IBuildOptions): Promise { + if (await this.$androidPluginBuildService.buildAar(options)) { + this.$logger.info(`Built aar for ${options.pluginName}`); + } + + this.$androidPluginBuildService.migrateIncludeGradle(options); + } + public async processConfigurationFilesFromAppResources(): Promise { return; } @@ -458,9 +542,9 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject public async removePluginNativeCode(pluginData: IPluginData, projectData: IProjectData): Promise { try { // check whether the dependency that's being removed has native code - // TODO: Remove prior to the 4.0 CLI release @Pip3r4o @PanayotCankov + // TODO: Remove prior to the 4.1 CLI release @Pip3r4o @PanayotCankov // the updated gradle script will take care of cleaning the prepared android plugins - if (!this.shouldUseNewRuntimeGradleRoutine(projectData)) { + if (!this.runtimeVersionIsGreaterThanOrEquals(projectData, "3.3.0")) { const pluginConfigDir = path.join(this.getPlatformData(projectData).projectRoot, "configurations", pluginData.name); if (this.$fs.exists(pluginConfigDir)) { await this.cleanProject(this.getPlatformData(projectData).projectRoot, projectData); @@ -480,14 +564,14 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject } public async beforePrepareAllPlugins(projectData: IProjectData, dependencies?: IDependencyData[]): Promise { - const shouldUseNewRoutine = this.shouldUseNewRuntimeGradleRoutine(projectData); + const shouldUseNewRoutine = this.runtimeVersionIsGreaterThanOrEquals(projectData, "3.3.0"); if (dependencies) { dependencies = this.filterUniqueDependencies(dependencies); if (shouldUseNewRoutine) { this.provideDependenciesJson(projectData, dependencies); } else { - // TODO: Remove prior to the 4.0 CLI release @Pip3r4o @PanayotCankov + // TODO: Remove prior to the 4.1 CLI release @Pip3r4o @PanayotCankov const platformDir = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME); const buildDir = path.join(platformDir, "build-tools"); @@ -524,7 +608,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject private provideDependenciesJson(projectData: IProjectData, dependencies: IDependencyData[]): void { const platformDir = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME); - const dependenciesJsonPath = path.join(platformDir, "dependencies.json"); + const dependenciesJsonPath = path.join(platformDir, constants.DEPENDENCIES_JSON_NAME); const nativeDependencies = dependencies .filter(AndroidProjectService.isNativeAndroidDependency) .map(({ name, directory }) => ({ name, directory: path.relative(platformDir, directory) })); @@ -538,14 +622,14 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject } public stopServices(projectRoot: string): Promise { - return this.executeGradleCommand(projectRoot, ["--stop", "--quiet"]); + return this.executeCommand(projectRoot, ["--stop", "--quiet"]); } public async cleanProject(projectRoot: string, projectData: IProjectData): Promise { if (this.$androidToolsInfo.getToolsInfo().androidHomeEnvVar) { - const buildOptions = this.getBuildOptions({ release: false }, projectData); + const buildOptions = this.getGradleBuildOptions({ release: false }, projectData); buildOptions.unshift("clean"); - await this.executeGradleCommand(projectRoot, buildOptions); + await this.executeCommand(projectRoot, buildOptions); } } @@ -606,10 +690,10 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject } } - private getTargetFromAndroidManifest(projectData: IProjectData): string { + private getTargetFromAndroidManifest(configurationFilePath: string): string { let versionInManifest: string; - if (this.$fs.exists(this.getPlatformData(projectData).configurationFilePath)) { - const targetFromAndroidManifest: string = this.$fs.readText(this.getPlatformData(projectData).configurationFilePath); + if (this.$fs.exists(configurationFilePath)) { + const targetFromAndroidManifest: string = this.$fs.readText(configurationFilePath); if (targetFromAndroidManifest) { const match = targetFromAndroidManifest.match(/.*?android:targetSdkVersion=\"(.*?)\"/); if (match && match[1]) { @@ -621,13 +705,12 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject return versionInManifest; } - private async executeGradleCommand(projectRoot: string, gradleArgs: string[], childProcessOpts?: SpawnOptions, spawnFromEventOptions?: ISpawnFromEventOptions): Promise { + public async executeCommand(projectRoot: string, gradleArgs: any, childProcessOpts?: SpawnOptions, spawnFromEventOptions?: ISpawnFromEventOptions): Promise { if (this.$androidToolsInfo.getToolsInfo().androidHomeEnvVar) { const gradlew = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew"; - const localArgs = [...gradleArgs]; if (this.$logger.getLevel() === "INFO") { - localArgs.push("--quiet"); + gradleArgs.push("--quiet"); this.$logger.info("Gradle build..."); } @@ -636,21 +719,12 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject childProcessOpts.stdio = childProcessOpts.stdio || "inherit"; return await this.spawn(gradlew, - localArgs, + gradleArgs, childProcessOpts, spawnFromEventOptions); } } - // TODO: Remove prior to the 4.0 CLI release @Pip3r4o @PanayotCankov - private shouldUseNewRuntimeGradleRoutine(projectData: IProjectData): boolean { - const platformVersion = this.getCurrentPlatformVersion(this.getPlatformData(projectData), projectData); - const newRuntimeGradleRoutineVersion = "3.3.0"; - - const normalizedPlatformVersion = `${semver.major(platformVersion)}.${semver.minor(platformVersion)}.0`; - return semver.gte(normalizedPlatformVersion, newRuntimeGradleRoutineVersion); - } - private isAndroidStudioCompatibleTemplate(projectData: IProjectData): boolean { const currentPlatformData: IDictionary = this.$projectDataService.getNSValue(projectData.projectDir, constants.TNS_ANDROID_RUNTIME_NAME); let platformVersion = currentPlatformData && currentPlatformData[constants.VERSION_STRING]; @@ -676,6 +750,17 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject return semver.gte(normalizedPlatformVersion, androidStudioCompatibleTemplate); } + + private runtimeVersionIsGreaterThanOrEquals(projectData: IProjectData, versionString: string): boolean { + const platformVersion = this.getCurrentPlatformVersion(this.getPlatformData(projectData), projectData); + + if (platformVersion === constants.PackageVersion.NEXT) { + return true; + } + + const normalizedPlatformVersion = `${semver.major(platformVersion)}.${semver.minor(platformVersion)}.0`; + return semver.gte(normalizedPlatformVersion, versionString); + } } $injector.register("androidProjectService", AndroidProjectService); diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index 803fad1d23..2efaea3163 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -15,6 +15,7 @@ import { IOSEntitlementsService } from "./ios-entitlements-service"; import { XCConfigService } from "./xcconfig-service"; import * as simplePlist from "simple-plist"; import * as mobileprovision from "ios-mobileprovision-finder"; +import { SpawnOptions } from "child_process"; export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService { private static XCODE_PROJECT_EXT_NAME = ".xcodeproj"; @@ -113,6 +114,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ return true; } + public async executeCommand(projectRoot: string, args: any, childProcessOpts?: SpawnOptions, spawnFromEventOptions?: ISpawnFromEventOptions): Promise { + return { stderr: "", stdout: "", exitCode: 0 }; + } + public getAppResourcesDestinationDirectoryPath(projectData: IProjectData): string { const frameworkVersion = this.getFrameworkVersion(this.getPlatformData(projectData).frameworkPackageName, projectData.projectDir); @@ -281,14 +286,14 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ method ${exportOptionsMethod}`; - if (options && options.provision) { - plistTemplate += ` provisioningProfiles + if (options && options.provision) { + plistTemplate += ` provisioningProfiles ${projectData.projectId} ${options.provision} `; - } - plistTemplate += ` + } + plistTemplate += ` uploadBitcode @@ -960,7 +965,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f return Promise.resolve(); } - public async checkForChanges(changesInfo: IProjectChangesInfo, {provision, teamId}: IProjectChangesOptions, projectData: IProjectData): Promise { + public async checkForChanges(changesInfo: IProjectChangesInfo, { provision, teamId }: IProjectChangesOptions, projectData: IProjectData): Promise { const hasProvision = provision !== undefined; const hasTeamId = teamId !== undefined; if (hasProvision || hasTeamId) { @@ -1007,6 +1012,18 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f } } + public async prebuildNativePlugin(options: IBuildOptions): Promise { + Promise.resolve(); + } + + public async checkIfPluginsNeedBuild(projectData: IProjectData): Promise> { + return []; + } + + public getBuildOptions(configurationFilePath: string): Array { + return []; + } + private getAllLibsForPluginWithFileExtension(pluginData: IPluginData, fileExtension: string): string[] { const filterCallback = (fileName: string, pluginPlatformsFolderPath: string) => path.extname(fileName) === fileExtension; return this.getAllNativeLibrariesForPlugin(pluginData, IOSProjectService.IOS_PLATFORM_NAME, filterCallback); @@ -1351,7 +1368,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f private validateApplicationIdentifier(projectData: IProjectData): void { const infoPlistPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, this.getPlatformData(projectData).configurationFileName); - const mergedPlistPath = this.getPlatformData(projectData).configurationFilePath; + const mergedPlistPath = this.getPlatformData(projectData).configurationFilePath; if (!this.$fs.exists(infoPlistPath) || !this.$fs.exists(mergedPlistPath)) { return; diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts index 8f133e22ab..5e71fef48d 100644 --- a/lib/services/livesync/livesync-service.ts +++ b/lib/services/livesync/livesync-service.ts @@ -2,7 +2,7 @@ import * as path from "path"; import * as choki from "chokidar"; import { EOL } from "os"; import { EventEmitter } from "events"; -import { hook } from "../../common/helpers"; +import { hook, isAllowedFinalFile } from "../../common/helpers"; import { PACKAGE_JSON_FILE_NAME, LiveSyncTrackActionNames, USER_INTERACTION_NEEDED_EVENT_NAME, DEBUGGER_ATTACHED_EVENT_NAME, DEBUGGER_DETACHED_EVENT_NAME, TrackActionNames } from "../../constants"; import { DeviceTypes, DeviceDiscoveryEventNames } from "../../common/constants"; import { cache } from "../../common/decorators"; @@ -561,6 +561,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi filesToRemove = []; const allModifiedFiles = [].concat(currentFilesToSync).concat(currentFilesToRemove); + const preparedPlatforms: string[] = []; const rebuiltInformation: ILiveSyncBuildInfo[] = []; @@ -658,16 +659,19 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi const watcher = choki.watch(patterns, watcherOptions) .on("all", async (event: string, filePath: string) => { + clearTimeout(timeoutTimer); filePath = path.join(liveSyncData.projectDir, filePath); this.$logger.trace(`Chokidar raised event ${event} for ${filePath}.`); - if (event === "add" || event === "addDir" || event === "change" /* <--- what to do when change event is raised ? */) { - filesToSync.push(filePath); - } else if (event === "unlink" || event === "unlinkDir") { - filesToRemove.push(filePath); + if (!isAllowedFinalFile(filePath)) { + if (event === "add" || event === "addDir" || event === "change" /* <--- what to do when change event is raised ? */) { + filesToSync.push(filePath); + } else if (event === "unlink" || event === "unlinkDir") { + filesToRemove.push(filePath); + } } startSyncFilesTimeout(); diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts index 6fd1369884..e09da69dcd 100644 --- a/lib/services/platform-service.ts +++ b/lib/services/platform-service.ts @@ -309,6 +309,7 @@ export class PlatformService extends EventEmitter implements IPlatformService { platformSpecificData, changesInfo, filesToSync, + filesToRemove, projectFilesConfig, env }); diff --git a/lib/services/project-changes-service.ts b/lib/services/project-changes-service.ts index 74a8195d1a..334ba8cad8 100644 --- a/lib/services/project-changes-service.ts +++ b/lib/services/project-changes-service.ts @@ -64,7 +64,7 @@ export class ProjectChangesService implements IProjectChangesService { this._changesInfo.packageChanged = this.isProjectFileChanged(projectData, platform); this._changesInfo.appResourcesChanged = this.containsNewerFiles(projectData.appResourcesDirectoryPath, null, projectData); /*done because currently all node_modules are traversed, a possible improvement could be traversing only the production dependencies*/ - this._changesInfo.nativeChanged = projectChangesOptions.skipModulesNativeCheck ? false : this.containsNewerFiles( + this._changesInfo.nativeChanged = this.containsNewerFiles( path.join(projectData.projectDir, NODE_MODULES_FOLDER_NAME), path.join(projectData.projectDir, NODE_MODULES_FOLDER_NAME, "tns-ios-inspector"), projectData, diff --git a/lib/tools/node-modules/node-modules-dest-copy.ts b/lib/tools/node-modules/node-modules-dest-copy.ts index 37d6a03903..ffe7270e4f 100644 --- a/lib/tools/node-modules/node-modules-dest-copy.ts +++ b/lib/tools/node-modules/node-modules-dest-copy.ts @@ -140,7 +140,7 @@ export class NpmPluginPrepare { } public async preparePlugins(dependencies: IDependencyData[], platform: string, projectData: IProjectData, projectFilesConfig: IProjectFilesConfig): Promise { - if (_.isEmpty(dependencies) || this.allPrepared(dependencies, platform, projectData)) { + if (_.isEmpty(dependencies)) { return; } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f2d268775c..ed7ed119c9 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -99,6 +99,15 @@ "integrity": "sha1-7mESGwqJiwvqXuskcgCJjg+o8Jw=", "dev": true }, + "@types/xml2js": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.2.tgz", + "integrity": "sha512-8aKUBSj3oGcnuiBmDLm3BIk09RYg01mz9HlQ2u4aS17oJ25DxjQrEUVGFSBVNOfM45pQW4OjcBPplq6r/exJdA==", + "dev": true, + "requires": { + "@types/node": "6.0.61" + } + }, "abbrev": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", @@ -737,7 +746,7 @@ "es6-promise": "4.1.1", "lodash": "4.17.4", "semver": "5.3.0", - "xml2js": "0.4.17" + "xml2js": "0.4.19" }, "dependencies": { "es6-promise": { @@ -4813,8 +4822,7 @@ "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", - "dev": true + "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=" }, "semver": { "version": "5.3.0", @@ -5764,23 +5772,18 @@ "integrity": "sha1-8Is0cQmRK+AChXhfRvFa2OUKX2c=" }, "xml2js": { - "version": "0.4.17", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz", - "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=", - "dev": true, + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", + "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", "requires": { "sax": "1.2.4", - "xmlbuilder": "4.2.1" + "xmlbuilder": "9.0.7" }, "dependencies": { "xmlbuilder": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz", - "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=", - "dev": true, - "requires": { - "lodash": "4.13.1" - } + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" } } }, diff --git a/package.json b/package.json index 1f70e34ca8..6fbe42b8b9 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "winreg": "0.0.17", "ws": "2.2.0", "xcode": "https://github.com/NativeScript/node-xcode/archive/1.4.0.tar.gz", + "xml2js": "0.4.19", "xmldom": "0.1.21", "xmlhttprequest": "https://github.com/telerik/node-XMLHttpRequest/tarball/master", "yargs": "6.0.0", @@ -98,6 +99,7 @@ "@types/sinon": "4.0.0", "@types/source-map": "0.5.0", "@types/universal-analytics": "0.4.1", + "@types/xml2js": "^0.4.2", "chai": "4.0.2", "chai-as-promised": "7.0.0", "grunt": "1.0.1", diff --git a/test/debug.ts b/test/debug.ts index 0d529a6f9b..067f81f580 100644 --- a/test/debug.ts +++ b/test/debug.ts @@ -76,6 +76,7 @@ function createTestInjector(): IInjector { } }); testInjector.register("settingsService", SettingsService); + testInjector.register("androidPluginBuildService", stubs.AndroidPluginBuildServiceStub); return testInjector; } diff --git a/test/ios-entitlements-service.ts b/test/ios-entitlements-service.ts index da9c522039..9d9f3fc6bf 100644 --- a/test/ios-entitlements-service.ts +++ b/test/ios-entitlements-service.ts @@ -47,7 +47,7 @@ describe("IOSEntitlements Service Tests", () => { injector = createTestInjector(); platformsData = injector.resolve("platformsData"); - projectData = injector.resolve("projectData"); + projectData = injector.resolve("projectData"); projectData.projectName = 'testApp'; projectData.platformsDir = temp.mkdirSync("platformsDir"); diff --git a/test/plugin-prepare.ts b/test/plugin-prepare.ts index bca777f0c8..27a93cd10a 100644 --- a/test/plugin-prepare.ts +++ b/test/plugin-prepare.ts @@ -32,20 +32,6 @@ describe("Plugin preparation", () => { assert.deepEqual({}, pluginPrepare.preparedDependencies); }); - it("skips prepare if every plugin prepared", async () => { - const pluginPrepare = new TestNpmPluginPrepare({ "tns-core-modules-widgets": true }); - const testDependencies: IDependencyData[] = [ - { - name: "tns-core-modules-widgets", - depth: 0, - directory: "some dir", - nativescript: null, - } - ]; - await pluginPrepare.preparePlugins(testDependencies, "android", null, {}); - assert.deepEqual({}, pluginPrepare.preparedDependencies); - }); - it("saves prepared plugins after preparation", async () => { const pluginPrepare = new TestNpmPluginPrepare({ "tns-core-modules-widgets": true }); const testDependencies: IDependencyData[] = [ diff --git a/test/plugins-service.ts b/test/plugins-service.ts index 7898c80c69..69ae22b59b 100644 --- a/test/plugins-service.ts +++ b/test/plugins-service.ts @@ -112,6 +112,8 @@ function createTestInjector() { }); testInjector.register("httpClient", {}); testInjector.register("extensibilityService", {}); + testInjector.register("androidPluginBuildService", stubs.AndroidPluginBuildServiceStub); + return testInjector; } diff --git a/test/services/android-plugin-build-service.ts b/test/services/android-plugin-build-service.ts new file mode 100644 index 0000000000..51b58372a6 --- /dev/null +++ b/test/services/android-plugin-build-service.ts @@ -0,0 +1,206 @@ +import { AndroidPluginBuildService } from "../../lib/services/android-plugin-build-service"; +import { Yok } from "../../lib/common/yok"; +import { assert } from "chai"; +import * as FsLib from "../../lib/common/file-system"; +import * as path from "path"; +import { HostInfo } from "../../lib/common/host-info"; +import { Logger } from "../../lib/common/logger"; +import * as ErrorsLib from "../../lib/common/errors"; +import temp = require("temp"); +temp.track(); + +describe('androiPluginBuildService', () => { + + let execCalled = false; + const createTestInjector = (): IInjector => { + const testInjector = new Yok(); + + testInjector.register("fs", FsLib.FileSystem); + testInjector.register("childProcess", { + exec: () => { + execCalled = true; + } + }); + testInjector.register("hostInfo", HostInfo); + testInjector.register("androidToolsInfo", { + getToolsInfo: () => { + return {}; + }, + validateInfo: () => { + return true; + } + }); + testInjector.register("logger", Logger); + testInjector.register("errors", ErrorsLib.Errors); + testInjector.register("options", {}); + testInjector.register("config", {}); + testInjector.register("staticConfig", {}); + + return testInjector; + }; + + let testInjector: IInjector; + let fs: IFileSystem; + let androidBuildPluginService: AndroidPluginBuildService; + let tempFolder: string; + let pluginFolder: string; + + function setUpIncludeGradle() { + fs = testInjector.resolve("fs"); + pluginFolder = temp.mkdirSync("AndroidProjectPropertiesManager-temp"); + + const validIncludeGradleContent = `android { + productFlavors { + "nativescript-pro-ui" { + dimension "nativescript-pro-ui" + } + } +} + +def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "23.3.0" + +dependencies { + compile "com.android.support:appcompat-v7:$supportVersion" + compile "com.android.support:recyclerview-v7:$supportVersion" + compile "com.android.support:design:$supportVersion" +}`; + + fs.writeFile(path.join(pluginFolder, "include.gradle"), validIncludeGradleContent); + } + + function setUpPluginNativeFolder(manifestFile: boolean, resFolder: boolean, assetsFolder: boolean) { + fs = testInjector.resolve("fs"); + tempFolder = temp.mkdirSync("AndroidProjectPropertiesManager"); + pluginFolder = temp.mkdirSync("AndroidProjectPropertiesManager-temp"); + + const validAndroidManifestContent = ` + +`; + const validStringsXmlContent = ` + + text_string +`; + + if (manifestFile) { + fs.writeFile(path.join(tempFolder, "AndroidManifest.xml"), validAndroidManifestContent); + } + + if (resFolder) { + const valuesFolder = path.join(tempFolder, "res", "values"); + fs.createDirectory(valuesFolder); + fs.writeFile(path.join(valuesFolder, "strings.xml"), validStringsXmlContent); + } + + if (assetsFolder) { + const imagesFolder = path.join(tempFolder, "assets", "images"); + fs.createDirectory(imagesFolder); + fs.writeFile(path.join(imagesFolder, "myicon.png"), "123"); + } + } + + before(() => { + testInjector = createTestInjector(); + androidBuildPluginService = testInjector.resolve(AndroidPluginBuildService); + }); + + beforeEach(() => { + execCalled = false; + }); + + describe('builds aar', () => { + + it('if supported files are in plugin', async () => { + setUpPluginNativeFolder(true, true, true); + const config: IBuildOptions = { + platformsAndroidDirPath: tempFolder, + pluginName: "my-plugin", + aarOutputDir: tempFolder, + tempPluginDirPath: pluginFolder + }; + + try { + await androidBuildPluginService.buildAar(config); + } catch (e) { + /* intentionally left blank */ + } + + assert.isTrue(execCalled); + }); + + it('if android manifest is missing', async () => { + setUpPluginNativeFolder(false, true, true); + const config: IBuildOptions = { + platformsAndroidDirPath: tempFolder, + pluginName: "my-plugin", + aarOutputDir: tempFolder, + tempPluginDirPath: pluginFolder + }; + + try { + await androidBuildPluginService.buildAar(config); + } catch (e) { + /* intentionally left blank */ + } + + assert.isTrue(execCalled); + }); + + it('if there is only an android manifest file', async () => { + setUpPluginNativeFolder(true, false, false); + const config: IBuildOptions = { + platformsAndroidDirPath: tempFolder, + pluginName: "my-plugin", + aarOutputDir: tempFolder, + tempPluginDirPath: pluginFolder + }; + + try { + await androidBuildPluginService.buildAar(config); + } catch (e) { + /* intentionally left blank */ + } + + assert.isTrue(execCalled); + }); + }); + + describe(`doesn't build aar `, () => { + it('if there are no files', async () => { + setUpPluginNativeFolder(false, false, false); + const config: IBuildOptions = { + platformsAndroidDirPath: tempFolder, + pluginName: "my-plugin", + aarOutputDir: tempFolder, + tempPluginDirPath: pluginFolder + }; + + try { + await androidBuildPluginService.buildAar(config); + } catch (e) { + /* intentionally left blank */ + } + + assert.isFalse(execCalled); + }); + }); + + describe(`handles include.gradle`, () => { + it('if there is a legacy include.gradle file', async () => { + setUpIncludeGradle(); + const config: IBuildOptions = { + platformsAndroidDirPath: pluginFolder, + pluginName: "my-plugin", + aarOutputDir: pluginFolder, + tempPluginDirPath: pluginFolder + }; + + const includeGradleName = "include.gradle"; + await androidBuildPluginService.migrateIncludeGradle(config); + const includeGradleContent = fs.readText(path.join(pluginFolder, includeGradleName).toString()); + const productFlavorsAreRemoved = includeGradleContent.indexOf("productFlavors") === -1; + assert.isTrue(productFlavorsAreRemoved); + }); + }); +}); diff --git a/test/services/livesync-service.ts b/test/services/livesync-service.ts index a3d15d0378..87b0dd9fe7 100644 --- a/test/services/livesync-service.ts +++ b/test/services/livesync-service.ts @@ -30,6 +30,12 @@ const createTestInjector = (): IInjector => { testInjector.register("usbLiveSyncService", { isInitialized: false }); + testInjector.register("platformsData", { + availablePlatforms: { + Android: "Android", + iOS: "iOS" + } + }); return testInjector; }; @@ -50,7 +56,8 @@ class LiveSyncServiceInheritor extends LiveSyncService { $debugDataService: IDebugDataService, $analyticsService: IAnalyticsService, $usbLiveSyncService: DeprecatedUsbLiveSyncService, - $injector: IInjector) { + $injector: IInjector, + $platformsData: IPlatformsData) { super( $platformService, @@ -68,8 +75,7 @@ class LiveSyncServiceInheritor extends LiveSyncService { $debugDataService, $analyticsService, $usbLiveSyncService, - $injector, - + $injector ); } diff --git a/test/stubs.ts b/test/stubs.ts index 2faf593fdb..096c196dc3 100644 --- a/test/stubs.ts +++ b/test/stubs.ts @@ -3,6 +3,7 @@ import * as util from "util"; import * as chai from "chai"; import { EventEmitter } from "events"; +import { SpawnOptions } from "child_process"; import * as path from "path"; import * as constants from "./../lib/constants"; @@ -286,6 +287,15 @@ export class ProjectDataStub implements IProjectData { } } +export class AndroidPluginBuildServiceStub implements IAndroidPluginBuildService { + buildAar(options: IBuildOptions): Promise { + return Promise.resolve(true); + } + migrateIncludeGradle(options: IBuildOptions): boolean { + return true; + } +} + export class PlatformProjectServiceStub extends EventEmitter implements IPlatformProjectService { getPlatformData(projectData: IProjectData): IPlatformData { return { @@ -302,6 +312,13 @@ export class PlatformProjectServiceStub extends EventEmitter implements IPlatfor fastLivesyncFileExtensions: [] }; } + prebuildNativePlugin(options: IBuildOptions): Promise { + return Promise.resolve(); + } + + checkIfPluginsNeedBuild(projectData: IProjectData): Promise> { + return Promise.resolve([]); + } getAppResourcesDestinationDirectoryPath(): string { return ""; } @@ -330,6 +347,10 @@ export class PlatformProjectServiceStub extends EventEmitter implements IPlatfor return Promise.resolve(); } + public async executeCommand(projectRoot: string, gradleArgs: string[], childProcessOpts?: SpawnOptions, spawnFromEventOptions?: ISpawnFromEventOptions): Promise { + return { stderr: "", stdout: "", exitCode: 0 }; + } + async buildProject(projectRoot: string): Promise { return Promise.resolve(); } @@ -351,6 +372,10 @@ export class PlatformProjectServiceStub extends EventEmitter implements IPlatfor return Promise.resolve(); } + getBuildOptions(configurationFilePath?: string): Array { + return []; + } + async removePluginNativeCode(pluginData: IPluginData): Promise { } async afterPrepareAllPlugins(): Promise { diff --git a/vendor/gradle-plugin/LICENSE b/vendor/gradle-plugin/LICENSE new file mode 100644 index 0000000000..745e3315a9 --- /dev/null +++ b/vendor/gradle-plugin/LICENSE @@ -0,0 +1,995 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. + + + +============================================================================== +Gradle Subcomponents: + +------------------------------------------------------------------------------ +License for the slf4j package +------------------------------------------------------------------------------ +SLF4J License + +Copyright (c) 2004-2007 QOS.ch +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +These terms are identical to those of the MIT License, also called the X License or the X11 License, +which is a simple, permissive non-copyleft free software license. It is deemed compatible with virtually +all types of licenses, commercial or otherwise. In particular, the Free Software Foundation has declared it +compatible with GNU GPL. It is also known to be approved by the Apache Software Foundation as compatible +with Apache Software License. + + +------------------------------------------------------------------------------ +License for the JUnit package +------------------------------------------------------------------------------ +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and +documentation distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses +to its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license set +forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered +by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on or +through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor to +control, and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may participate in +any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement, including but not limited to the risks and costs of +program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with respect to +a patent applicable to software (including a cross-claim or counterclaim in a +lawsuit), then any patent licenses granted by that Contributor to such Recipient +under this Agreement shall terminate as of the date such litigation is filed. In +addition, if Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the Program +itself (excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +IBM is the initial Agreement Steward. IBM may assign the responsibility to serve +as the Agreement Steward to a suitable separate entity. Each new version of the +Agreement will be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the Agreement +under which it was received. In addition, after a new version of the Agreement +is published, Contributor may elect to distribute the Program (including its +Contributions) under the new version. Except as expressly stated in Sections +2(a) and 2(b) above, Recipient receives no rights or licenses to the +intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + +------------------------------------------------------------------------------ +License for the JCIFS package +------------------------------------------------------------------------------ +JCIFS License + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + +------------------------------------------------------------------------------ +License for the JGit package +------------------------------------------------------------------------------ +Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the Eclipse Foundation, Inc. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/vendor/gradle-plugin/build.gradle b/vendor/gradle-plugin/build.gradle new file mode 100644 index 0000000000..d04eb3b2d7 --- /dev/null +++ b/vendor/gradle-plugin/build.gradle @@ -0,0 +1,36 @@ + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.2' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +apply plugin: 'com.android.library' + +def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 24 } +def computeBuildToolsVersion = { -> + project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.1" +} + +android { + compileSdkVersion computeCompileSdkVersion() + buildToolsVersion computeBuildToolsVersion() + + defaultConfig { + targetSdkVersion 26 + versionCode 1 + versionName "1.0" + } +} diff --git a/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..b10af18628 Binary files /dev/null and b/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..55a7a86c65 --- /dev/null +++ b/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Dec 21 13:58:00 EET 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip diff --git a/vendor/gradle-plugin/gradlew b/vendor/gradle-plugin/gradlew new file mode 100755 index 0000000000..4453ccea33 --- /dev/null +++ b/vendor/gradle-plugin/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/vendor/gradle-plugin/gradlew.bat b/vendor/gradle-plugin/gradlew.bat new file mode 100644 index 0000000000..f9553162f1 --- /dev/null +++ b/vendor/gradle-plugin/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega