diff --git a/extension/extension.iml b/extension/extension.iml index 7a054d9..c309524 100644 --- a/extension/extension.iml +++ b/extension/extension.iml @@ -1,5 +1,5 @@ - + @@ -72,6 +72,8 @@ + + @@ -89,14 +91,14 @@ - + - + @@ -105,11 +107,11 @@ - + - + diff --git a/extension/gradle.properties b/extension/gradle.properties index cf8756d..a44d138 100644 --- a/extension/gradle.properties +++ b/extension/gradle.properties @@ -20,5 +20,5 @@ GROUP=com.tmall.android ARTIFACT=vlayout-ext VERSION=111 -VERSION_NAME=1.1.1.2 +VERSION_NAME=1.1.1.3 PACKAGING_TYPE=aar diff --git a/vlayout.iml b/vlayout.iml index f8e5848..2c98bd1 100644 --- a/vlayout.iml +++ b/vlayout.iml @@ -1,5 +1,5 @@ - + @@ -7,121 +7,15 @@ - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vlayout/build.gradle b/vlayout/build.gradle index 699c0ee..9bc87dc 100644 --- a/vlayout/build.gradle +++ b/vlayout/build.gradle @@ -28,9 +28,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - //compile project(':extension') + compile project(':extension') - compile 'com.tmall.android:vlayout-ext:1.1.1.2@aar' + //compile 'com.tmall.android:vlayout-ext:1.1.1.2@aar' compile 'com.android.support:recyclerview-v7:21.0.2@aar' compile('com.android.support:support-v4:21.0.0@aar') { exclude group: 'com.android.support', module: 'support-annotations' diff --git a/vlayout/vlayout-vlayout.iml b/vlayout/vlayout-vlayout.iml index 84bf16b..5afc75f 100644 --- a/vlayout/vlayout-vlayout.iml +++ b/vlayout/vlayout-vlayout.iml @@ -72,7 +72,6 @@ - @@ -104,16 +103,16 @@ - - + + \ No newline at end of file diff --git a/vlayout/vlayout.iml b/vlayout/vlayout.iml index 68102b2..8b402ed 100644 --- a/vlayout/vlayout.iml +++ b/vlayout/vlayout.iml @@ -27,7 +27,7 @@ - + @@ -95,13 +95,13 @@ - + - + @@ -109,8 +109,8 @@ - +