Repository: cordova-android
Updated Branches:
  refs/heads/master 23fd0982b -> f5ab6fc60


adding tests for AndroidStudio


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/222fb1c0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/222fb1c0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/222fb1c0

Branch: refs/heads/master
Commit: 222fb1c0e7db63ef859818499517c4b238f81514
Parents: 511fe7c
Author: Anis Kadri <a...@apache.org>
Authored: Thu Sep 15 16:18:35 2016 -0700
Committer: Joe Bowser <bows...@apache.org>
Committed: Tue Sep 20 19:54:34 2016 -0700

----------------------------------------------------------------------
 .../android_studio_project/app/.gitignore       |   1 +
 .../android_studio_project/app/build.gradle     |  26 +++
 .../app/proguard-rules.pro                      |  17 ++
 .../app/src/main/AndroidManifest.xml            |  20 +++
 .../app/src/main/res/layout/activity_main.xml   |  17 ++
 .../src/main/res/mipmap-hdpi/ic_launcher.png    | Bin 0 -> 3418 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png    | Bin 0 -> 2206 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png   | Bin 0 -> 4842 bytes
 .../src/main/res/mipmap-xxhdpi/ic_launcher.png  | Bin 0 -> 7718 bytes
 .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes
 .../app/src/main/res/values-w820dp/dimens.xml   |   6 +
 .../app/src/main/res/values/colors.xml          |   6 +
 .../app/src/main/res/values/dimens.xml          |   5 +
 .../app/src/main/res/values/strings.xml         |   3 +
 .../app/src/main/res/values/styles.xml          |  11 ++
 .../android_studio_project/build.gradle         |  23 +++
 .../android_studio_project/gradle.properties    |  18 +++
 .../gradle/wrapper/gradle-wrapper.properties    |   6 +
 spec/fixtures/android_studio_project/gradlew    | 160 +++++++++++++++++++
 .../fixtures/android_studio_project/gradlew.bat |  90 +++++++++++
 .../android_studio_project/settings.gradle      |   1 +
 spec/unit/AndroidStudio.js                      |  14 ++
 22 files changed, 424 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/.gitignore
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/app/.gitignore 
b/spec/fixtures/android_studio_project/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/.gitignore
@@ -0,0 +1 @@
+/build

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/build.gradle
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/app/build.gradle 
b/spec/fixtures/android_studio_project/app/build.gradle
new file mode 100644
index 0000000..5485f06
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
+
+    defaultConfig {
+        applicationId "com.example.anis.myapplication"
+        minSdkVersion 21
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 
'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/proguard-rules.pro
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/app/proguard-rules.pro 
b/spec/fixtures/android_studio_project/app/proguard-rules.pro
new file mode 100644
index 0000000..15bbf26
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/anis/opt/android-sdk-macosx/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/AndroidManifest.xml 
b/spec/fixtures/android_studio_project/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..b9140cd
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android";
+          package="com.example.anis.myapplication">
+
+    <application
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/layout/activity_main.xml
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/layout/activity_main.xml
 
b/spec/fixtures/android_studio_project/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..2a65552
--- /dev/null
+++ 
b/spec/fixtures/android_studio_project/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android";
+        xmlns:tools="http://schemas.android.com/tools";
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        tools:context="com.example.anis.myapplication.MainActivity">
+
+    <TextView
+            android:text="Hello World!"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+</RelativeLayout>

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher.png
 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..cde69bc
Binary files /dev/null and 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher.png
 differ

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher.png
 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..c133a0c
Binary files /dev/null and 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher.png
 differ

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher.png
 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..bfa42f0
Binary files /dev/null and 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher.png
 differ

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..324e72c
Binary files /dev/null and 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 differ

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..aee44e1
Binary files /dev/null and 
b/spec/fixtures/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 differ

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/values-w820dp/dimens.xml
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/values-w820dp/dimens.xml
 
b/spec/fixtures/android_studio_project/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ 
b/spec/fixtures/android_studio_project/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in 
res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of 
available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp 
respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/values/colors.xml
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/values/colors.xml 
b/spec/fixtures/android_studio_project/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..3ab3e9c
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/values/dimens.xml
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/values/dimens.xml 
b/spec/fixtures/android_studio_project/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/values/strings.xml 
b/spec/fixtures/android_studio_project/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..efd3073
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">My Application</string>
+</resources>

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/app/src/main/res/values/styles.xml
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/app/src/main/res/values/styles.xml 
b/spec/fixtures/android_studio_project/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..5885930
--- /dev/null
+++ b/spec/fixtures/android_studio_project/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/build.gradle
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/build.gradle 
b/spec/fixtures/android_studio_project/build.gradle
new file mode 100644
index 0000000..168f129
--- /dev/null
+++ b/spec/fixtures/android_studio_project/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all 
sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.0.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/gradle.properties
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/gradle.properties 
b/spec/fixtures/android_studio_project/gradle.properties
new file mode 100644
index 0000000..1d3591c
--- /dev/null
+++ b/spec/fixtures/android_studio_project/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m 
-XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# 
http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git 
a/spec/fixtures/android_studio_project/gradle/wrapper/gradle-wrapper.properties 
b/spec/fixtures/android_studio_project/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..122a0dc
--- /dev/null
+++ 
b/spec/fixtures/android_studio_project/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/gradlew
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/gradlew 
b/spec/fixtures/android_studio_project/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/spec/fixtures/android_studio_project/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to 
pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# 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
+
+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" ] ; 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
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the 
shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" 
org.gradle.wrapper.GradleWrapperMain "$@"

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/gradlew.bat
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/gradlew.bat 
b/spec/fixtures/android_studio_project/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/spec/fixtures/android_studio_project/gradlew.bat
@@ -0,0 +1,90 @@
+@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
+
+@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=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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 Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_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=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+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

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/fixtures/android_studio_project/settings.gradle
----------------------------------------------------------------------
diff --git a/spec/fixtures/android_studio_project/settings.gradle 
b/spec/fixtures/android_studio_project/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/spec/fixtures/android_studio_project/settings.gradle
@@ -0,0 +1 @@
+include ':app'

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/222fb1c0/spec/unit/AndroidStudio.js
----------------------------------------------------------------------
diff --git a/spec/unit/AndroidStudio.js b/spec/unit/AndroidStudio.js
new file mode 100644
index 0000000..74c11f2
--- /dev/null
+++ b/spec/unit/AndroidStudio.js
@@ -0,0 +1,14 @@
+var AndroidStudio = require('../../bin/templates/cordova/lib/AndroidStudio');
+
+describe('AndroidStudio module', function () {
+    it('should detect Android Studio project', function() {
+      var root = './fixtures/android_studio_project';
+      spyOn(AndroidStudio, 'isAndroidStudioProject').andReturn(true);
+      AndroidStudio.isAndroidStudioProject(root);
+    });
+    it('should detect non Android Studio project', function() {
+      var root = './fixtures/android_project';
+      spyOn(AndroidStudio, 'isAndroidStudioProject').andReturn(false);
+      AndroidStudio.isAndroidStudioProject(root);
+    });
+});


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

Reply via email to