Skip to content

Commit

Permalink
Update build tools to support new release
Browse files Browse the repository at this point in the history
  • Loading branch information
serggl committed Jul 16, 2019
1 parent 450b46d commit 83e8136
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ jdk:
android:
components:
- tools
- build-tools-25.0.3
- build-tools-28.0.3
- android-21
- android-23
- android-26
- extra-android-m2repository
- sys-img-armeabi-v7a-android-21

Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ buildscript {
url 'https://maven.google.com/'
name 'Google'
}
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.7.0'
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jul 03 11:27:59 KST 2019
#Tue Jul 16 09:35:53 MSK 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
20 changes: 10 additions & 10 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ group 'com.anjlab.android.iab.v3'
version '1.0.44'

android {
compileSdkVersion 23
buildToolsVersion '25.0.3'
compileSdkVersion 26
buildToolsVersion '28.0.3'

defaultConfig {
versionCode 1
versionName project.version
minSdkVersion 8
targetSdkVersion 23
minSdkVersion 9
targetSdkVersion 26
consumerProguardFiles 'progress-proguard.txt'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand All @@ -33,10 +33,10 @@ android {
}

dependencies {
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
compile 'com.android.support:support-annotations:25.3.1'
compile 'com.android.billingclient:billing:2.0.1'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
implementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.android.billingclient:billing:2.0.1'
}

configurations.archives.extendsFrom configurations.default
Expand Down Expand Up @@ -126,8 +126,8 @@ android.libraryVariants.all { variant ->
return; // Skip debug builds.
}
def task = project.tasks.create "jar${name.capitalize()}", Jar
task.dependsOn variant.javaCompile
task.from variant.javaCompile.destinationDir
task.dependsOn variant.javaCompileProvider
task.from variant.javaCompileProvider.get().destinationDir
task.baseName 'anjlab-iabv3'
task.doLast {
println "Copying jar to sample project..."
Expand Down
13 changes: 7 additions & 6 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
apply plugin: 'com.android.application'

dependencies {
compile project(':library')
// compile fileTree(dir: 'libs', include: '*.jar')
implementation project(':library')
// implementation fileTree(dir: 'libs', include: '*.jar')
implementation 'com.android.support:support-annotations:28.0.0'
}

android {
compileSdkVersion 23
buildToolsVersion '25.0.3'
compileSdkVersion 26
buildToolsVersion '28.0.3'

defaultConfig {
versionCode 2
versionName '1.0'
minSdkVersion 8
targetSdkVersion 23
minSdkVersion 9
targetSdkVersion 26
}

sourceSets.main {
Expand Down
Binary file modified sample/libs/anjlab-iabv3-current.jar
Binary file not shown.

0 comments on commit 83e8136

Please sign in to comment.