Merge branch 'feature/replace_git_submodule_with_gradle' into develop

kotya341 · kotya341 · commit c271fb69b981 · 2015-02-13T17:40:17.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "lib/CircularReveal"]
-	path = lib/CircularReveal
-	url = git@github.com:ozodrukh/CircularReveal.git
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,9 @@
 apply plugin: 'com.android.application'
-
+repositories {
+    maven {
+        url "https://jitpack.io"
+    }
+}
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
@@ -19,8 +23,8 @@ android {
 }
 
 dependencies {
-    compile project(':lib:CircularReveal:circualreveal')
     compile project(':library')
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:21.0.3'
+    compile 'com.github.ozodrukh:CircularReveal:1.0.4'
 }
diff --git a/lib/CircularReveal b/lib/CircularReveal
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app',	':lib:CircularReveal:circualreveal',':library'
+include ':app',':library'

Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-[submodule "lib/CircularReveal"]`
`2`		`- path = lib/CircularReveal`
`3`		`- url = [email protected]:ozodrukh/CircularReveal.git`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include ':app', ':lib:CircularReveal:circualreveal',':library'`
	`1`	`+include ':app',':library'`