Last active
April 12, 2017 08:58
-
-
Save hypest/5817eca2e8c617a15d1412f3a2d4d5ca to your computer and use it in GitHub Desktop.
Make Aztec be a local lib to wpandroid. Aztec's source code is symlinked to `wpandroid/libs/WordPress-Aztec-Android`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/aztec/build.gradle b/aztec/build.gradle | |
index 3f8fa81..9dbaba7 100644 | |
--- a/aztec/build.gradle | |
+++ b/aztec/build.gradle | |
@@ -1,6 +1,24 @@ | |
+buildscript { | |
+ ext.kotlin_version = '1.0.6' | |
+ repositories { | |
+ jcenter() | |
+ mavenCentral() | |
+ } | |
+ | |
+ dependencies { | |
+ classpath 'com.android.tools.build:gradle:2.3.1' | |
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | |
+ } | |
+} | |
+ | |
apply plugin: 'com.android.library' | |
apply plugin: 'kotlin-android' | |
+repositories { | |
+ jcenter() | |
+ mavenCentral() | |
+} | |
+ | |
android { | |
compileSdkVersion 25 | |
buildToolsVersion "25.0.2" | |
@@ -38,7 +56,3 @@ dependencies { | |
//https://github.com/robolectric/robolectric/issues/1932 | |
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1' | |
} | |
- | |
-repositories { | |
- mavenCentral() | |
-} | |
\ No newline at end of file | |
diff --git a/build.gradle b/build.gradle | |
index c6cd96a..e69de29 100644 | |
--- a/build.gradle | |
+++ b/build.gradle | |
@@ -1,21 +0,0 @@ | |
-buildscript { | |
- ext.kotlin_version = '1.0.6' | |
- repositories { | |
- jcenter() | |
- } | |
- | |
- dependencies { | |
- classpath 'com.android.tools.build:gradle:2.2.3' | |
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | |
- } | |
-} | |
- | |
-allprojects { | |
- repositories { | |
- jcenter() | |
- } | |
-} | |
- | |
-task clean(type: Delete) { | |
- delete rootProject.buildDir | |
-} | |
diff --git a/glide-loader/build.gradle b/glide-loader/build.gradle | |
index 1af34f9..95b8639 100644 | |
--- a/glide-loader/build.gradle | |
+++ b/glide-loader/build.gradle | |
@@ -1,6 +1,23 @@ | |
+buildscript { | |
+ ext.kotlin_version = '1.0.6' | |
+ repositories { | |
+ jcenter() | |
+ } | |
+ | |
+ dependencies { | |
+ classpath 'com.android.tools.build:gradle:2.3.1' | |
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | |
+ } | |
+} | |
+ | |
apply plugin: 'com.android.library' | |
apply plugin: 'kotlin-android' | |
+repositories { | |
+ jcenter() | |
+ mavenCentral() | |
+} | |
+ | |
android { | |
compileSdkVersion 25 | |
buildToolsVersion "25.0.2" | |
@@ -21,7 +38,7 @@ android { | |
} | |
dependencies { | |
- compile project(':aztec') | |
+ compile project(':libs:WordPress-Aztec-Android:aztec') | |
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" | |
compile 'com.android.support:appcompat-v7:25.1.0' | |
compile 'com.github.bumptech.glide:glide:3.7.0' | |
diff --git a/picasso-loader/build.gradle b/picasso-loader/build.gradle | |
index f478516..9eac914 100644 | |
--- a/picasso-loader/build.gradle | |
+++ b/picasso-loader/build.gradle | |
@@ -1,6 +1,23 @@ | |
+buildscript { | |
+ ext.kotlin_version = '1.0.6' | |
+ repositories { | |
+ jcenter() | |
+ } | |
+ | |
+ dependencies { | |
+ classpath 'com.android.tools.build:gradle:2.3.1' | |
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | |
+ } | |
+} | |
+ | |
apply plugin: 'com.android.library' | |
apply plugin: 'kotlin-android' | |
+repositories { | |
+ jcenter() | |
+ mavenCentral() | |
+} | |
+ | |
android { | |
compileSdkVersion 25 | |
buildToolsVersion "25.0.2" | |
@@ -20,7 +37,7 @@ android { | |
} | |
dependencies { | |
- compile project(':aztec') | |
+ compile project(':libs:WordPress-Aztec-Android:aztec') | |
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" | |
compile 'com.android.support:appcompat-v7:25.1.0' | |
compile 'com.squareup.picasso:picasso:2.5.2' | |
diff --git a/settings.gradle b/settings.gradle | |
index 43d5874..0f69d9a 100644 | |
--- a/settings.gradle | |
+++ b/settings.gradle | |
@@ -1 +1,3 @@ | |
-include ':app', ':aztec', ':glide-loader', ':picasso-loader' | |
+include ':aztec' | |
+include ':glide-loader' | |
+include ':picasso-loader' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/build.gradle b/WordPress/build.gradle | |
index 5080dc0..dfb632a 100644 | |
--- a/WordPress/build.gradle | |
+++ b/WordPress/build.gradle | |
@@ -146,6 +146,7 @@ dependencies { | |
// Debug | |
debugCompile 'com.facebook.stetho:stetho:1.4.2' | |
+ compile project(':libs:WordPress-Aztec-Android:aztec') | |
} | |
configurations.all { | |
diff --git a/build.gradle b/build.gradle | |
index 1042727..212773c 100644 | |
--- a/build.gradle | |
+++ b/build.gradle | |
@@ -9,3 +9,12 @@ subprojects { | |
} | |
} | |
} | |
+//buildscript { | |
+// ext.kotlin_version = '1.0.6' | |
+// repositories { | |
+// mavenCentral() | |
+// } | |
+// dependencies { | |
+// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | |
+// } | |
+//} | |
diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle | |
index 798f7e7..eeea2d1 100644 | |
--- a/libs/editor/WordPressEditor/build.gradle | |
+++ b/libs/editor/WordPressEditor/build.gradle | |
@@ -51,7 +51,7 @@ dependencies { | |
compile 'com.android.support:design:25.1.1' | |
compile 'org.apache.commons:commons-lang3:3.5' | |
compile 'org.wordpress:utils:1.+' | |
- compile ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v0.5.0-alpha.5') | |
+ compile project(':libs:WordPress-Aztec-Android:aztec') | |
} | |
signing { | |
diff --git a/libs/editor/settings.gradle b/libs/editor/settings.gradle | |
index af0d929..edbc839 100644 | |
--- a/libs/editor/settings.gradle | |
+++ b/libs/editor/settings.gradle | |
@@ -1,2 +1,5 @@ | |
include ':WordPressEditor' | |
include ':example' | |
+include ':libs:WordPress-Aztec-Android:aztec' | |
+include ':libs:WordPress-Aztec-Android:glide-loader' | |
+include ':libs:WordPress-Aztec-Android:picasso-loader' | |
diff --git a/settings.gradle b/settings.gradle | |
index d00ff04..79e3345 100644 | |
--- a/settings.gradle | |
+++ b/settings.gradle | |
@@ -3,3 +3,6 @@ include ':libs:utils:WordPressUtils' | |
include ':libs:networking:WordPressNetworking' | |
include ':libs:analytics:WordPressAnalytics' | |
include ':libs:editor:WordPressEditor' | |
+include ':libs:WordPress-Aztec-Android:aztec' | |
+include ':libs:WordPress-Aztec-Android:glide-loader' | |
+include ':libs:WordPress-Aztec-Android:picasso-loader' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment