Skip to content

Commit

Permalink
Remove min 21 config
Browse files Browse the repository at this point in the history
  • Loading branch information
Jawnnypoo committed Mar 16, 2017
1 parent 6791ded commit 1f6db5d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -10,7 +10,7 @@ android:
components:
- tools
- platform-tools
- build-tools-25.0.0
- build-tools-25.0.2
- android-25
- extra-android-m2repository
- extra-google-m2repository
Expand All @@ -23,4 +23,4 @@ jdk:
- oraclejdk8

script:
- ./gradlew -PdisablePreDex assembleProd lintProd{With,No}GPlay{Debug,Release} testProd{With,No}GPlay{Debug,Release}UnitTest
- ./gradlew -PdisablePreDex assemble lint{With,No}GPlay{Debug,Release} test{With,No}GPlay{Debug,Release}UnitTest
19 changes: 2 additions & 17 deletions app/build.gradle
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.0'
buildToolsVersion '25.0.2'
lintOptions {
quiet true
abortOnError false
Expand All @@ -16,32 +16,17 @@ android {
}
defaultConfig {
applicationId "me.ccrama.redditslide"
minSdkVersion 15
targetSdkVersion 25
versionCode 264
multiDexEnabled = true
versionName androidGitVersion.name()
}

flavorDimensions "api", "gplay"

productFlavors {
dev {
// dev utilizes minSDKVersion = 21 to allow the Android gradle plugin
// to pre-dex each module and produce an APK that can be used
// without time consuming dex merging processes.
dimension "api"
minSdkVersion 21
}
prod {
// The actual minSdkVersion for the application.
dimension "api"
minSdkVersion 15
}
withGPlay {
dimension "gplay"
}
noGPlay {
dimension "gplay"
}
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.android.tools.build:gradle:2.3.0'
// ./gradlew dependencyUpdates
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Mon Aug 22 18:24:13 BST 2016
#Wed Mar 15 23:25:36 CDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 comments on commit 1f6db5d

Please sign in to comment.