From 040e4cb7e454d532d249d2a5de6f2aba0c902baa Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 24 Dec 2019 19:23:32 -0800 Subject: Updated submodules; removed tests folder (tests are now part of every submodule) --- Tests/Android/TestApp/build.gradle | 28 ------------------- Tests/Android/TestApp/src/main/AndroidManifest.xml | 31 ---------------------- .../java/com/diligentengine/testapp/TestApp.java | 22 --------------- .../testapp/TestAppNativeActivity.java | 22 --------------- .../TestApp/src/main/res/values/strings.xml | 5 ---- 5 files changed, 108 deletions(-) delete mode 100644 Tests/Android/TestApp/build.gradle delete mode 100644 Tests/Android/TestApp/src/main/AndroidManifest.xml delete mode 100644 Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestApp.java delete mode 100644 Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestAppNativeActivity.java delete mode 100644 Tests/Android/TestApp/src/main/res/values/strings.xml (limited to 'Tests/Android/TestApp') diff --git a/Tests/Android/TestApp/build.gradle b/Tests/Android/TestApp/build.gradle deleted file mode 100644 index 70e486a..0000000 --- a/Tests/Android/TestApp/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -apply plugin: 'com.android.application' -apply from: "../../../Common/NativeApp/Android/android_common.gradle" - -android { - defaultConfig { - applicationId = 'com.diligentengine.testapp' - } - buildTypes { - release { - minifyEnabled = false - proguardFiles getDefaultProguardFile('proguard-android.txt'), - 'proguard-rules.pro' - } - } - sourceSets { - main { - assets.srcDirs = ['../../TestApp/assets'] - } - } -} - -buildDir '../build/TestApp' - -dependencies { - implementation project(":Common") - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' -} diff --git a/Tests/Android/TestApp/src/main/AndroidManifest.xml b/Tests/Android/TestApp/src/main/AndroidManifest.xml deleted file mode 100644 index 4475bee..0000000 --- a/Tests/Android/TestApp/src/main/AndroidManifest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestApp.java b/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestApp.java deleted file mode 100644 index 4da060e..0000000 --- a/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestApp.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2013 The Android Open Source Project - * - * 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. - */ - -package com.diligentengine.testapp; -import com.diligentengine.android.common.DiligentApplicationBase; - -public class TestApp extends DiligentApplicationBase { - -} diff --git a/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestAppNativeActivity.java b/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestAppNativeActivity.java deleted file mode 100644 index f29f0eb..0000000 --- a/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestAppNativeActivity.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2013 The Android Open Source Project - * - * 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. - */ - -package com.diligentengine.testapp; -import com.diligentengine.android.common.NativeActivityBase; - -public class TestAppNativeActivity extends NativeActivityBase { - -} diff --git a/Tests/Android/TestApp/src/main/res/values/strings.xml b/Tests/Android/TestApp/src/main/res/values/strings.xml deleted file mode 100644 index 9c20773..0000000 --- a/Tests/Android/TestApp/src/main/res/values/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - Test Application - - -- cgit v1.2.3