Last active
January 22, 2019 10:14
-
-
Save Tug/50f0a51b7833a94d5f05f4fa7020a289 to your computer and use it in GitHub Desktop.
Make aztec changes in gutenberg-mobile
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/android/build.gradle b/android/build.gradle | |
index 228e5f3..6924ae9 100644 | |
--- a/android/build.gradle | |
+++ b/android/build.gradle | |
@@ -1,7 +1,8 @@ | |
buildscript { | |
ext { | |
- gradlePluginVersion = '3.1.0' | |
- kotlinVersion = '1.2.31' | |
+ gradlePluginVersion = '3.1.3' | |
+ kotlinVersion = '1.3.11' | |
+ kotlinCoroutinesVersion = '1.1.0' | |
supportLibVersion = '27.1.1' | |
tagSoupVersion = '1.2.1' | |
glideVersion = '3.7.0' | |
diff --git a/android/settings.gradle b/android/settings.gradle | |
index 42be4a6..e8b3a13 100644 | |
--- a/android/settings.gradle | |
+++ b/android/settings.gradle | |
@@ -7,3 +7,9 @@ include ':react-native-recyclerview-list' | |
project(':react-native-recyclerview-list').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-recyclerview-list/android') | |
include ':app' | |
+ | |
+include ':aztec', ':glide-loader', ':wordpress-comments', ':wordpress-shortcodes' | |
+project(':aztec').projectDir = new File(rootProject.projectDir, '../../AztecEditor-Android/aztec') | |
+project(':glide-loader').projectDir = new File(rootProject.projectDir, '../../AztecEditor-Android/glide-loader') | |
+project(':wordpress-comments').projectDir = new File(rootProject.projectDir, '../../AztecEditor-Android/wordpress-comments') | |
+project(':wordpress-shortcodes').projectDir = new File(rootProject.projectDir, '../../AztecEditor-Android/wordpress-shortcodes') | |
diff --git a/gutenberg b/gutenberg | |
--- a/gutenberg | |
+++ b/gutenberg | |
@@ -1 +1 @@ | |
-Subproject commit 7ece780b6f5fd9a7950e9718fb0f744793942b4e | |
+Subproject commit 7ece780b6f5fd9a7950e9718fb0f744793942b4e-dirty | |
diff --git a/react-native-aztec/android/build.gradle b/react-native-aztec/android/build.gradle | |
index 1654104..d163d62 100644 | |
--- a/react-native-aztec/android/build.gradle | |
+++ b/react-native-aztec/android/build.gradle | |
@@ -96,10 +96,16 @@ repositories { | |
} | |
dependencies { | |
+/* | |
api ("com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:$aztecVersion") | |
api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-shortcodes:$aztecVersion") | |
api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-comments:$aztecVersion") | |
api ("com.github.wordpress-mobile.WordPress-Aztec-Android:glide-loader:$aztecVersion") | |
+*/ | |
+ api project(':aztec') | |
+ api project(':glide-loader') | |
+ api project(':wordpress-comments') | |
+ api project(':wordpress-shortcodes') | |
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment