cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [7/7] cordova-lib git commit: CB-12777 : removed android_install fixtures
Date Fri, 02 Jun 2017 22:47:00 GMT
CB-12777 : removed android_install fixtures


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/75e5e048
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/75e5e048
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/75e5e048

Branch: refs/heads/master
Commit: 75e5e048ed2056b61cf6a02200fbd50557a2b4b8
Parents: 3c69f3b
Author: Audrey So <audreyso@apache.org>
Authored: Tue May 9 11:38:48 2017 -0700
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Fri Jun 2 15:17:39 2017 -0700

----------------------------------------------------------------------
 cordova-lib/spec-cordova/platform.spec.js       |  2 +-
 .../android_install/AndroidManifest.xml         | 20 -----------------
 .../android_install/cordova/android_sdk_version |  1 -
 .../projects/android_install/cordova/version    | 23 --------------------
 .../android_install/cordova/version.bat         |  2 --
 .../projects/android_install/local.properties   |  1 -
 6 files changed, 1 insertion(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/75e5e048/cordova-lib/spec-cordova/platform.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/platform.spec.js b/cordova-lib/spec-cordova/platform.spec.js
index b667d7c..c15b0f2 100644
--- a/cordova-lib/spec-cordova/platform.spec.js
+++ b/cordova-lib/spec-cordova/platform.spec.js
@@ -144,7 +144,7 @@ describe('platform end-to-end', function () {
             expect(err).toBeUndefined();
         })
         .fin(done);
-    });
+    },60000);
 
     it('Test 003 : should call prepare after plugins were installed into platform', function(done)
{
         var order = '';

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/75e5e048/cordova-lib/spec-plugman/projects/android_install/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/projects/android_install/AndroidManifest.xml b/cordova-lib/spec-plugman/projects/android_install/AndroidManifest.xml
deleted file mode 100644
index d5068dc..0000000
--- a/cordova-lib/spec-plugman/projects/android_install/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest android:versionCode="5" android:versionName="1.1" android:windowSoftInputMode="adjustPan"
package="cordova.test.uninstall" xmlns:android="http://schemas.android.com/apk/res/android">
-    <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true"
android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
-    <application android:debuggable="true" android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:configChanges="orientation|keyboardHidden" android:label="@string/app_name"
android:name="ChildApp">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:configChanges="orientation|keyboardHidden" android:label="@string/app_name"
android:name="org.test.DroidGap">
-            <intent-filter>
-            </intent-filter>
-        </activity>
-        <activity android:label="@string/app_name" android:name="DummyPlugin.org.test.plugins.dummyplugin">
-            <intent-filter />
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="5" />
-</manifest>

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/75e5e048/cordova-lib/spec-plugman/projects/android_install/cordova/android_sdk_version
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/projects/android_install/cordova/android_sdk_version
b/cordova-lib/spec-plugman/projects/android_install/cordova/android_sdk_version
deleted file mode 100644
index 3338346..0000000
--- a/cordova-lib/spec-plugman/projects/android_install/cordova/android_sdk_version
+++ /dev/null
@@ -1 +0,0 @@
-echo 18.0.9

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/75e5e048/cordova-lib/spec-plugman/projects/android_install/cordova/version
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/projects/android_install/cordova/version b/cordova-lib/spec-plugman/projects/android_install/cordova/version
deleted file mode 100755
index 3c331da..0000000
--- a/cordova-lib/spec-plugman/projects/android_install/cordova/version
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you 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.
-*/
-
-console.log('9.0.0');
-

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/75e5e048/cordova-lib/spec-plugman/projects/android_install/cordova/version.bat
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/projects/android_install/cordova/version.bat b/cordova-lib/spec-plugman/projects/android_install/cordova/version.bat
deleted file mode 100644
index 09a622a..0000000
--- a/cordova-lib/spec-plugman/projects/android_install/cordova/version.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-echo 9.0.0

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/75e5e048/cordova-lib/spec-plugman/projects/android_install/local.properties
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/projects/android_install/local.properties b/cordova-lib/spec-plugman/projects/android_install/local.properties
deleted file mode 100644
index cdf2deb..0000000
--- a/cordova-lib/spec-plugman/projects/android_install/local.properties
+++ /dev/null
@@ -1 +0,0 @@
-sdk.dir=foo


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


Mime
View raw message