Merge pull request #134 from flipkart-incubator/develop

merge 'develop' into 'master'

Author: adityasharat

build.gradle

@@ -1,20 +1,17 @@
 /*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright 2019 Flipkart Internet Pvt. Ltd.
  *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Copyright (c) 2018 Flipkart Internet Pvt. Ltd.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use
- * this file except in compliance with the License. You may obtain a copy of the
- * License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
@@ -43,10 +40,10 @@ allprojects {
 
 ext {
     groupName = 'com.github.flipkart-incubator.proteus'
-    versionName = '5.0.0-rc13'
-    versionCode = 500013
+    versionName = '5.0.0-snapshot'
+    versionCode = 500014
     compileSdkVersion = 28
-    minSdkVersion = 14
+    minSdkVersion = 19
     targetSdkVersion = 28
     buildToolsVersion = '28.0.3'
     supportLibraryVersion = '28.0.0'

cardview-v7/build.gradle

@@ -1,20 +1,17 @@
 /*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright 2019 Flipkart Internet Pvt. Ltd.
  *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Copyright (c) 2018 Flipkart Internet Pvt. Ltd.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use
- * this file except in compliance with the License. You may obtain a copy of the
- * License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 apply plugin: 'com.android.library'
@@ -30,8 +27,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

cardview-v7/src/main/AndroidManifest.xml

@@ -1,20 +1,17 @@
 <!--
-  ~ Apache License
-  ~ Version 2.0, January 2004
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Copyright 2019 Flipkart Internet Pvt. Ltd.
   ~
-  ~ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~ Copyright (c) 2018 Flipkart Internet Pvt. Ltd.
+  ~     http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-  ~ this file except in compliance with the License. You may obtain a copy of the
-  ~ License at http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software distributed
-  ~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-  ~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations under the License.
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
 
 <manifest package="com.flipkart.android.proteus.support.v7" />

cardview-v7/src/main/java/com/flipkart/android/proteus/support/v7/CardViewModule.java

@@ -1,20 +1,17 @@
 /*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright 2019 Flipkart Internet Pvt. Ltd.
  *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Copyright (c) 2018 Flipkart Internet Pvt. Ltd.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use
- * this file except in compliance with the License. You may obtain a copy of the
- * License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.flipkart.android.proteus.support.v7;
@@ -30,15 +27,15 @@
 
 public class CardViewModule implements ProteusBuilder.Module {
 
-    private CardViewModule() {
-    }
+  private CardViewModule() {
+  }
 
-    public static CardViewModule create() {
-        return new CardViewModule();
-    }
+  public static CardViewModule create() {
+    return new CardViewModule();
+  }
 
-    @Override
-    public void registerWith(ProteusBuilder builder) {
-        builder.register(new CardViewParser());
-    }
+  @Override
+  public void registerWith(ProteusBuilder builder) {
+    builder.register(new CardViewParser());
+  }
 }