From 34c0cee0ca2c4fc302364eb33f4e71fb33bc02b5 Mon Sep 17 00:00:00 2001 From: Emux Date: Sat, 18 Jun 2016 16:44:46 +0300 Subject: [PATCH] Remove external git submodule 'appcompat', closes #22 --- .gitmodules | 4 ---- build.gradle | 4 ---- settings.gradle | 1 - vtm-android-example/build.gradle | 2 +- vtm-android-start/build.gradle | 2 +- vtm-android/build.gradle | 2 +- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index e830803c..31578508 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,3 @@ [submodule "libtess2"] path = jni/jni/libtess2 url = https://github.com/memononen/libtess2.git - -[submodule "appcompat"] - path = appcompat - url = https://github.com/hjanetzek/android-support-v7-appcompat.git diff --git a/build.gradle b/build.gradle index 187689aa..5c01de76 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,3 @@ -if (!(new File("$rootDir/appcompat/build.gradle").exists())) { - throw new GradleException('Missing git sub modules!\nPLEASE RUN: "git submodule init && git submodule update"') -} - buildscript { repositories { mavenCentral() diff --git a/settings.gradle b/settings.gradle index 37224aa7..e475db29 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ rootProject.name = 'vtm-parent' -include ':appcompat' include ':vtm' include ':vtm-tests' include ':vtm-extras' diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index 3c268a40..04510c26 100644 --- a/vtm-android-example/build.gradle +++ b/vtm-android-example/build.gradle @@ -14,7 +14,7 @@ dependencies { compile 'com.android.support:support-v4:22.+' compile 'com.android.support:appcompat-v7:22.+' - eclipseCompile project(':appcompat') + //eclipseCompile project(':appcompat') compile 'com.noveogroup.android:android-logger:1.3.4' } diff --git a/vtm-android-start/build.gradle b/vtm-android-start/build.gradle index 9f70681d..c5027f68 100644 --- a/vtm-android-start/build.gradle +++ b/vtm-android-start/build.gradle @@ -12,7 +12,7 @@ dependencies { compile 'com.android.support:support-v4:22.+' compile 'com.android.support:appcompat-v7:22.+' - eclipseCompile project(':appcompat') + //eclipseCompile project(':appcompat') compile 'com.noveogroup.android:android-logger:1.3.4' } diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle index cad6a248..2f9bd3f8 100644 --- a/vtm-android/build.gradle +++ b/vtm-android/build.gradle @@ -10,7 +10,7 @@ dependencies { provided files('vtm-jni-natives.jar') compile 'com.android.support:support-v4:21.+' - eclipseCompile project(':appcompat') + //eclipseCompile project(':appcompat') } android {