Created
June 6, 2018 11:31
-
-
Save hypest/96c3e8366332787189b3e4bb89a85c90 to your computer and use it in GitHub Desktop.
wpandroid patch to compile Aztec directly
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/build.gradle b/build.gradle | |
index 29290bc..fb8d9b4 100644 | |
--- a/build.gradle | |
+++ b/build.gradle | |
@@ -1,6 +1,19 @@ | |
buildscript { | |
- ext.kotlin_version = '1.2.31' | |
- ext.arch_components_version = '1.1.1' | |
+ ext { | |
+ gradlePluginVersion = '3.0.1' | |
+ kotlinVersion = '1.2.41' // the version used by Aztec | |
+ kotlin_version = '1.2.41' // the version used by wpandroid | |
+ supportLibVersion = '27.1.1' | |
+ tagSoupVersion = '1.2.1' | |
+ glideVersion = '3.7.0' | |
+ picassoVersion = '2.5.2' | |
+ robolectricVersion = '3.5.1' | |
+ jUnitVersion = '4.12' | |
+ jSoupVersion = '1.10.3' | |
+ wordpressUtilsVersion = '1.21' | |
+ espressoVersion = '3.0.1' | |
+ arch_components_version = '1.1.1' | |
+ } | |
repositories { | |
jcenter() | |
@@ -10,6 +23,7 @@ buildscript { | |
dependencies { | |
classpath 'com.android.tools.build:gradle:3.1.2' | |
classpath 'com.automattic.android:fetchstyle:1.1' | |
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" | |
} | |
} | |
diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle | |
index e488cc1..edf7ea7 100644 | |
--- a/libs/editor/WordPressEditor/build.gradle | |
+++ b/libs/editor/WordPressEditor/build.gradle | |
@@ -52,9 +52,9 @@ dependencies { | |
implementation 'org.apache.commons:commons-lang3:3.5' | |
implementation 'org.wordpress:utils:1.18.1' | |
- api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.5') | |
- api ('com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-shortcodes:v1.3.5') | |
- api ('com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-comments:v1.3.5') | |
+ api project(':aztec') | |
+ api project(':wordpress-shortcodes') | |
+ api project(':wordpress-comments') | |
// Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out) | |
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.1.4" | |
diff --git a/settings.gradle b/settings.gradle | |
index 6a47761..ca901ef 100644 | |
--- a/settings.gradle | |
+++ b/settings.gradle | |
@@ -4,3 +4,9 @@ include ':libs:networking:WordPressNetworking' | |
include ':libs:analytics:WordPressAnalytics' | |
include ':libs:editor:WordPressEditor' | |
include ':libs:login:WordPressLoginFlow' | |
+ | |
+include ':aztec', ':glide-loader', ':wordpress-comments', ':wordpress-shortcodes' | |
+project(':aztec').projectDir = new File(rootProject.projectDir, '../WordPress-Aztec-Android/aztec') | |
+project(':glide-loader').projectDir = new File(rootProject.projectDir, '../WordPress-Aztec-Android/glide-loader') | |
+project(':wordpress-comments').projectDir = new File(rootProject.projectDir, '../WordPress-Aztec-Android/wordpress-comments') | |
+project(':wordpress-shortcodes').projectDir = new File(rootProject.projectDir, '../WordPress-Aztec-Android/wordpress-shortcodes') |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment