Skip to content

Commit

Permalink
Migrate to gradle 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
vrih committed Nov 18, 2018
1 parent 5b31819 commit 8c610f6
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 8 deletions.
3 changes: 0 additions & 3 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="github.daneren2005.serverproxy">

<uses-sdk android:targetSdkVersion="19"
android:minSdkVersion="8" />

<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
</manifest>
41 changes: 36 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
buildscript {
repositories {
jcenter()
google()
}

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

apply plugin: 'android-library'
apply plugin: 'com.android.library'

repositories {
jcenter()
google()
}

dependencies {
compile 'com.android.support:support-v4:18.0.+'
implementation 'com.android.support:support-v4:18.0.+'
}

android {
compileSdkVersion 22
buildToolsVersion '25.0.0'
compileSdkVersion 27

defaultConfig {
targetSdkVersion 26
minSdkVersion = 8
}

sourceSets {
main {
Expand All @@ -33,4 +39,29 @@ android {
assets.srcDirs = ['assets']
}
}

buildTypes {
release {
minifyEnabled true
proguardFiles 'proguard.cfg'
zipAlignEnabled true
}
fix {
minifyEnabled true
proguardFiles 'proguard.cfg'
zipAlignEnabled true
}
}
flavorDimensions "version"
productFlavors {
floss {
// FLOSS build (no proprietary libraries)
dimension "version"
}
google {
// FLOSS build + Google libraries
// Adds ChromeCast support
dimension "version"
}
}
}

0 comments on commit 8c610f6

Please sign in to comment.