Merge branch 'master' into feature/readme

Archinamon · web-flow · commit 087878dd3185 · 2017-11-05T16:41:55.000+03:00
diff --git a/android-gradle-aspectj/build.gradle b/android-gradle-aspectj/build.gradle
@@ -16,7 +16,7 @@ apply plugin: 'maven'
 apply plugin: 'com.jfrog.bintray'
 
 project.ext {
-    aspectjVersion = '1.8.10'
+    aspectjVersion = '1.8.12'
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ apply plugin: 'maven'`
`16`	`16`	`apply plugin: 'com.jfrog.bintray'`
`17`	`17`
`18`	`18`	`project.ext {`
`19`		`- aspectjVersion = '1.8.10'`
	`19`	`+ aspectjVersion = '1.8.12'`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`dependencies {`