Skip to content
This repository has been archived by the owner on Jan 2, 2021. It is now read-only.

Commit

Permalink
Merge pull request #49 from DevAhamed/v1.3.0
Browse files Browse the repository at this point in the history
v1.3.0
  • Loading branch information
DevAhamed authored Sep 26, 2018
2 parents ffe1347 + 30c4c9e commit 8c5aaac
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 23 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ Helper library for recyclerviews to create composable view holders without boile
The Gradle dependency is available via [JCenter](https://bintray.com/devahamed/MultiViewAdapter/multi-view-adapter/view).
JCenter is the default maven repository used by Android Studio.

The minimum API level supported by this library is API 9.
The minimum API level supported by this library is API 14.

```gradle
dependencies {
compile 'com.github.devahamed:multi-view-adapter:1.2.3'
compile 'com.github.devahamed:multi-view-adapter:1.3.0'
// If you want to use data binding
compile 'com.github.devahamed:multi-view-adapter-databinding:1.2.3'
compile 'com.github.devahamed:multi-view-adapter-databinding:1.3.0'
}
```

Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.novoda:bintray-release:0.7.0'
classpath 'org.jacoco:org.jacoco.core:0.8.1'
}
}

Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/java/gradle/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@

public class Config {

public static final int MIN_SDK = 9;
public static final int COMPILE_SDK = 25;
public static final int MIN_SDK = 14;
public static final int COMPILE_SDK = 28;
public static final int TARGET_SDK = COMPILE_SDK;

public static final String VERSION_NAME = "1.2.6";
public static final int VERSION_CODE = 126;
public static final String VERSION_NAME = "1.3.0";
public static final int VERSION_CODE = 130;

private static final String SUPPORT_LIB_VERSION = "25.4.0";
private static final String SUPPORT_LIB_VERSION = "28.0.0";
private static final String SUPPORT = "com.android.support:";

public static final String APP_COMPAT = SUPPORT + "appcompat-v7:" + SUPPORT_LIB_VERSION;
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

org.gradle.parallel=true
org.gradle.parallel=true


android.databinding.enableV2=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
4 changes: 2 additions & 2 deletions multi-view-adapter-databinding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ dependencies {
implementation project(':multi-view-adapter')
implementation Config.RECYCLER_VIEW

compileOnly('com.android.databinding:library:1.3.1') {
compileOnly('com.android.databinding:library:3.2.0') {
transitive = false
}
compileOnly('com.android.databinding:baseLibrary:2.3.2') {
compileOnly('com.android.databinding:baseLibrary:3.2.0') {
transitive = false
}
}
Expand Down
12 changes: 7 additions & 5 deletions multi-view-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ apply plugin: 'com.novoda.bintray-release'
apply plugin: 'jacoco'

jacoco {
toolVersion = "0.7.4.201502262128"
toolVersion = "0.8.1"
}

tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
}

task jacocoTestReport(type: JacocoReport,
Expand Down Expand Up @@ -65,10 +69,8 @@ android {
}

testOptions {
unitTests.all {
jacoco {
includeNoLocationClasses = true
}
unitTests {
includeAndroidResources = true
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ android {
}

dependencies {
compile project(':multi-view-adapter')
compile project(':multi-view-adapter-databinding')
implementation project(':multi-view-adapter')
implementation project(':multi-view-adapter-databinding')

implementation Config.APP_COMPAT
implementation Config.RECYCLER_VIEW
implementation Config.CARD_VIEW
implementation Config.DESIGN
compile 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'

debugCompile "com.github.brianPlummer:tinydancer:0.1.0"
releaseCompile "com.github.brianPlummer:tinydancer-noop:0.1.0"
debugImplementation "com.github.brianPlummer:tinydancer:0.1.0"
releaseImplementation "com.github.brianPlummer:tinydancer-noop:0.1.0"
}

0 comments on commit 8c5aaac

Please sign in to comment.