Skip to content

Commit

Permalink
Update to newest Gradle, AGP, Kotlin and Android Support libs (#131)
Browse files Browse the repository at this point in the history 
* update to newest Gradle, AGP, Kotlin and Android Support libs

* update travis dependencies

* update travis dependencies

* update travis dependencies

* add agree for sdk-28 license

* fix BenchmarkTest & update travis config
  • Loading branch information
@sgrekov @zserge
sgrekov authored and zserge committed May 15, 2019
1 parent cc0c4a7 commit 0825ae9
Show file tree
Hide file tree
Showing 19 changed files with 345 additions and 260 deletions.
9 changes: 7 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ env:
android:
components:
- tools
- build-tools-25.0.2
- android-25
- build-tools-27.0.3
- android-27
- extra-android-m2repository
licenses:
- 'android-sdk-license-.+'

before_install:
- yes | sdkmanager "platforms;android-28"

jdk:
- oraclejdk8
Expand Down
36 changes: 20 additions & 16 deletions anvil-appcompat-v7/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"

android {
compileSdkVersion 'android-25'
buildToolsVersion '25.0.2'
compileSdkVersion 27

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand All @@ -19,7 +19,9 @@ android {

defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27

missingDimensionStrategy 'api', 'sdk15'
}

lintOptions {
Expand All @@ -36,23 +38,25 @@ anvilgen {
type = "support"
libraryName = "appcompat-v7"
camelCaseName = "AppCompatv7"
version = "25.1.1"
version = support_version
dependencies = [
"support-core-ui": [null],
"support-core-utils": [null],
"support-compat": [null],
"support-media-compat": [null],
"support-fragment": [null],
"support-core-ui": null,
"support-core-utils": null,
"support-compat": null,
"support-media-compat": null,
"support-fragment": null,
"viewmodel": "1.1.0",
"android.arch.lifecycle-common": "1.1.0",
]
quirks = QUIRKS
}

dependencies {
compile project(path: ':anvil', configuration: 'sdk15Release')
compile 'com.android.support:appcompat-v7:25.1.1'
implementation project(path: ':anvil')
implementation "com.android.support:appcompat-v7:$support_version"

testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.0.36-beta'
testImplementation 'junit:junit:4.12'
testImplementation "org.mockito:mockito-core:$mockito_version"
}

apply plugin: 'maven-publish'
Expand Down Expand Up @@ -143,8 +147,8 @@ artifacts {
android.libraryVariants.all { variant ->
task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
description "Generates Javadoc for $variant.name."
source = variant.javaCompile.source
source = variant.getCompileClasspath(null).getAsFileTree()
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
classpath = files(variant.getCompileClasspath(null)) + files(ext.androidJar)
}
}
51 changes: 42 additions & 9 deletions anvil-appcompat-v7/src/main/java/trikita/anvil/appcompat/v7/AppCompatv7DSL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import android.support.v7.widget.FitWindowsLinearLayout;
import android.support.v7.widget.FitWindowsViewGroup;
import android.support.v7.widget.LinearLayoutCompat;
import android.support.v7.widget.ListViewCompat;
import android.support.v7.widget.ScrollingTabContainerView;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.SwitchCompat;
Expand Down Expand Up @@ -295,14 +294,6 @@ public static Void linearLayoutCompat(Anvil.Renderable r) {
return BaseDSL.v(LinearLayoutCompat.class, r);
}

public static BaseDSL.ViewClassResult listViewCompat() {
return BaseDSL.v(ListViewCompat.class);
}

public static Void listViewCompat(Anvil.Renderable r) {
return BaseDSL.v(ListViewCompat.class, r);
}

public static BaseDSL.ViewClassResult scrollingTabContainerView() {
return BaseDSL.v(ScrollingTabContainerView.class);
}
Expand Down Expand Up @@ -367,6 +358,10 @@ public static Void attachListener(ContentFrameLayout.OnAttachListener arg) {
return BaseDSL.attr("attachListener", arg);
}

public static Void autoSizeTextTypeWithDefaults(int arg) {
return BaseDSL.attr("autoSizeTextTypeWithDefaults", arg);
}

public static Void baselineAligned(boolean arg) {
return BaseDSL.attr("baselineAligned", arg);
}
Expand Down Expand Up @@ -687,6 +682,14 @@ public static Void supportButtonTintMode(PorterDuff.Mode arg) {
return BaseDSL.attr("supportButtonTintMode", arg);
}

public static Void supportImageTintList(ColorStateList arg) {
return BaseDSL.attr("supportImageTintList", arg);
}

public static Void supportImageTintMode(PorterDuff.Mode arg) {
return BaseDSL.attr("supportImageTintMode", arg);
}

public static Void switchMinWidth(int arg) {
return BaseDSL.attr("switchMinWidth", arg);
}
Expand Down Expand Up @@ -845,6 +848,16 @@ public boolean set(View v, String name, final Object arg, final Object old) {
return true;
}
break;
case "autoSizeTextTypeWithDefaults":
if (v instanceof AppCompatButton && arg instanceof Integer) {
((AppCompatButton) v).setAutoSizeTextTypeWithDefaults((int) arg);
return true;
}
if (v instanceof AppCompatTextView && arg instanceof Integer) {
((AppCompatTextView) v).setAutoSizeTextTypeWithDefaults((int) arg);
return true;
}
break;
case "baselineAligned":
if (v instanceof LinearLayoutCompat && arg instanceof Boolean) {
((LinearLayoutCompat) v).setBaselineAligned((boolean) arg);
Expand Down Expand Up @@ -1527,6 +1540,26 @@ public boolean onSuggestionSelect(int a0) {
return true;
}
break;
case "supportImageTintList":
if (v instanceof AppCompatImageButton && arg instanceof ColorStateList) {
((AppCompatImageButton) v).setSupportImageTintList((ColorStateList) arg);
return true;
}
if (v instanceof AppCompatImageView && arg instanceof ColorStateList) {
((AppCompatImageView) v).setSupportImageTintList((ColorStateList) arg);
return true;
}
break;
case "supportImageTintMode":
if (v instanceof AppCompatImageButton && arg instanceof PorterDuff.Mode) {
((AppCompatImageButton) v).setSupportImageTintMode((PorterDuff.Mode) arg);
return true;
}
if (v instanceof AppCompatImageView && arg instanceof PorterDuff.Mode) {
((AppCompatImageView) v).setSupportImageTintMode((PorterDuff.Mode) arg);
return true;
}
break;
case "switchMinWidth":
if (v instanceof SwitchCompat && arg instanceof Integer) {
((SwitchCompat) v).setSwitchMinWidth((int) arg);
Expand Down
26 changes: 14 additions & 12 deletions anvil-cardview-v7/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"

android {
compileSdkVersion 'android-25'
buildToolsVersion '25.0.2'
compileSdkVersion 27

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand All @@ -19,7 +19,9 @@ android {

defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27

missingDimensionStrategy 'api', 'sdk15'
}

lintOptions {
Expand All @@ -36,17 +38,17 @@ anvilgen {
type = "support"
libraryName = "cardview-v7"
camelCaseName = "CardViewv7"
version = "25.1.1"
dependencies = ["cardview-v7": ["libs/internal_impl-$version".toString()]]
version = support_version
dependencies = ["cardview-v7": null]
quirks = QUIRKS
}

dependencies {
compile project(path: ':anvil', configuration: 'sdk15Release')
compile 'com.android.support:cardview-v7:25.1.1'
implementation project(path: ':anvil')
implementation "com.android.support:cardview-v7:$support_version"

testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.0.36-beta'
testImplementation 'junit:junit:4.12'
testImplementation "org.mockito:mockito-core:$mockito_version"
}

apply plugin: 'maven-publish'
Expand Down Expand Up @@ -137,8 +139,8 @@ artifacts {
android.libraryVariants.all { variant ->
task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
description "Generates Javadoc for $variant.name."
source = variant.javaCompile.source
source = variant.getCompileClasspath(null).getAsFileTree()
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
classpath = files(variant.getCompileClasspath(null)) + files(ext.androidJar)
}
}
42 changes: 23 additions & 19 deletions anvil-design/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"

android {
compileSdkVersion 'android-25'
buildToolsVersion '25.0.2'
compileSdkVersion 27

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand All @@ -19,7 +19,9 @@ android {

defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27

missingDimensionStrategy 'api', 'sdk15'
}

lintOptions {
Expand All @@ -36,26 +38,28 @@ anvilgen {
type = "support"
libraryName = "design"
camelCaseName = "Design"
version = "25.1.1"
version = support_version
dependencies = [
"support-core-ui": [null],
"support-core-utils": [null],
"support-compat": [null],
"support-media-compat": [null],
"support-fragment": [null],
"transition": [null],
"appcompat-v7": [null],
"recyclerview-v7": [null]
"support-core-ui": null,
"support-core-utils": null,
"support-compat": null,
"support-media-compat": null,
"support-fragment": null,
"transition": null,
"appcompat-v7": null,
"recyclerview-v7": null,
"android.arch.lifecycle-common": "1.1.0",
"viewmodel": "1.1.0"
]
quirks = QUIRKS
}

dependencies {
compile project(path: ':anvil', configuration: 'sdk15Release')
compile 'com.android.support:design:25.1.1'
implementation project(path: ':anvil')
implementation "com.android.support:design:$support_version"

testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.0.36-beta'
testImplementation 'junit:junit:4.12'
testImplementation "org.mockito:mockito-core:$mockito_version"
}

apply plugin: 'maven-publish'
Expand Down Expand Up @@ -146,8 +150,8 @@ artifacts {
android.libraryVariants.all { variant ->
task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
description "Generates Javadoc for $variant.name."
source = variant.javaCompile.source
source = variant.getCompileClasspath(null).getAsFileTree()
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
classpath = files(variant.getCompileClasspath(null)) + files(ext.androidJar)
}
}
Loading

0 comments on commit 0825ae9

Please sign in to comment.