Merge pull request #21 from Fueled/fix-compiler

fix(.*): fix dependencies issues
Fueled · May 24, 2017 · 5b4c247 · 5b4c247
2 parents c6178c6 + be46b6b
commit 5b4c247
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -21,8 +21,8 @@ Then add the dependency to the application module:
 
 ```groovy
 	dependencies {
-		annotationProcessor 'com.github.Fueled.flowr:flowr-compilers:1.2.1'
-		compile 'com.github.fueled:flowr:1.2.1'
+		annotationProcessor 'com.github.Fueled.flowr:flowr-compiler:1.2.2'
+		compile 'com.github.fueled:flowr:1.2.2'
 	}
 ```
 

diff --git a/extra/gradle/libraries.gradle b/extra/gradle/libraries.gradle
@@ -9,7 +9,7 @@ ext {
 
     //library
     libraryGroup = 'com.github.fueled'
-    libraryVersion = '1.2.0'
+    libraryVersion = '1.2.2'
 
     //android libraries
     supportVersion = '25.1.1'

diff --git a/flowr-annotations/build.gradle b/flowr-annotations/build.gradle
@@ -1,4 +1,8 @@
 apply plugin: 'java'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = libraryGroup
+version = libraryVersion
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])

diff --git a/flowr-compilers/.gitignore → flowr-compiler/.gitignore b/flowr-compilers/.gitignore → flowr-compiler/.gitignore
diff --git a/flowr-compilers/build.gradle → flowr-compiler/build.gradle b/flowr-compilers/build.gradle → flowr-compiler/build.gradle
diff --git a/...compilers/DeepLinkAnnotationCompiler.java → ...compilers/DeepLinkAnnotationCompiler.java b/...compilers/DeepLinkAnnotationCompiler.java → ...compilers/DeepLinkAnnotationCompiler.java
diff --git a/...ces/javax.annotation.processing.Processor → ...ces/javax.annotation.processing.Processor b/...ces/javax.annotation.processing.Processor → ...ces/javax.annotation.processing.Processor
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 
     compile project(':flowr')
 
-    annotationProcessor project(':flowr-compilers')
+    annotationProcessor project(':flowr-compiler')
 
     compile libraries.appCompat
     compile libraries.designSupport

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':flowr', ':sample', ':flowr-annotations', ':flowr-compilers'
+include ':flowr', ':sample', ':flowr-annotations', ':flowr-compiler'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':flowr', ':sample', ':flowr-annotations', ':flowr-compilers'
		include ':flowr', ':sample', ':flowr-annotations', ':flowr-compiler'