Skip to content

Commit

Permalink
bumped gradle from 2.9 to 3.3 and android-gradle plugin to 2.3.3 from…
Browse files Browse the repository at this point in the history
… 1.3.1
  • Loading branch information
crankycoder committed Feb 9, 2019
1 parent d0f4895 commit cc14845
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 67 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'com.android.tools.build:gradle:2.3.3'
}
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'com.android.tools.build:gradle:2.3.3'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
68 changes: 5 additions & 63 deletions libraries/stumbler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,11 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'

classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'com.android.tools.build:gradle:2.3.3'
}
}

apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

allprojects {
repositories {
Expand All @@ -36,19 +31,18 @@ android {
compileSdkVersion 28
buildToolsVersion "28.0.3"

sourceSets {
androidTest.setRoot('src/test')
}

defaultConfig {
minSdkVersion 10
targetSdkVersion 28
}

lintOptions {
disable 'MissingTranslation'
checkReleaseBuilds false
//If you want to continue even if errors found use following line
abortOnError false
}


}

Properties properties = new Properties()
Expand All @@ -59,58 +53,6 @@ if (bintrayFile.exists()) {
properties = null
}

bintray {
if (properties != null) {
user = properties.getProperty("bintray.user")
key = properties.getProperty("bintray.apikey")
}
configurations = ['archives']
pkg {
repo = "libMozStumbler"
name = "libMozStumbler"
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = ["MPL-2.0"]
publish = true
}
}



install {
repositories.mavenInstaller {
pom {
project {
packaging 'aar'
name 'A simple library to embed Mozilla Stumbler.'
url siteUrl
licenses {
license {
name 'Mozilla Public License, Version 2.0'
url 'https://www.mozilla.org/MPL/2.0/'
}
}
developers {
developer {
id 'garvankeeley'
name 'Garvan Keeley'
email '[email protected]'
}
developer {
id 'crankycoder'
name 'Victor Ng'
email '[email protected]'
}
}
scm {
connection gitUrl
developerConnection gitUrl
url siteUrl
}
}
}
}
}

dependencies {
androidTestCompile 'junit:junit:4.10'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 comments on commit cc14845

Please sign in to comment.