Commit 39a0f968 authored by sisbell's avatar sisbell
Browse files

Fixes #19: Make manifest sdk versions configurable through gradle.properties

parent 51c0d41e

gradle.properties

+6 −0
Original line number Diff line number Diff line
@@ -16,3 +16,9 @@ kotlin.code.style=official 


# Configure Android Gradle Plugin Version

androidplugin=3.2.1



# Build versions

appcompatVersion=28.0.0

compileVersion=28

targetVersion=28

minVersion=21
 
 No newline at end of file

jsocksAndroid/build.gradle

+3 −19
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ apply plugin: 'com.android.library' 


android {

    defaultConfig {

        compileSdkVersion "${compileVersion}".toInteger()

        targetSdkVersion "${targetVersion}".toInteger()

        minSdkVersion "${minVersion}".toInteger()

        consumerProguardFiles 'proguard-rules.pro'

    }

    buildTypes {
@@ -9,23 +12,4 @@ android { 
            minifyEnabled false

        }

    }



    flavorDimensions "sdk"



    productFlavors {

        sdkVer26 {

            dimension "sdk"

            compileSdkVersion 26

            targetSdkVersion 26

            minSdkVersion 16

            versionNameSuffix "-sdk26"

        }

        sdkVer28 {

            dimension "sdk"

            compileSdkVersion 28

            targetSdkVersion 28

            minSdkVersion 21

            versionNameSuffix "-sdk28"

        }

    }

}

service/build.gradle

+4 −20
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ android { 
    defaultConfig {

        versionCode 1

        versionName "1.0"

        compileSdkVersion "${compileVersion}".toInteger()

        targetSdkVersion "${targetVersion}".toInteger()

        minSdkVersion "${minVersion}".toInteger()

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        consumerProguardFiles 'proguard-rules.pro'

    }
@@ -23,32 +26,13 @@ android { 
    lintOptions {

        abortOnError false

    }



    flavorDimensions "sdk"



    productFlavors {

        sdkVer26 {

            dimension "sdk"

            compileSdkVersion 26

            targetSdkVersion 26

            minSdkVersion 16

            versionNameSuffix "-sdk26"

        }



        sdkVer28 {

            dimension "sdk"

            compileSdkVersion 28

            versionNameSuffix "-sdk28"

        }

    }

}



dependencies {

    implementation project(':jsocksAndroid')

    compileOnly fileTree(dir: 'libs', include: ['*.jar', '*.aar'])

    sdkVer28Implementation 'com.android.support:appcompat-v7:28.0.0'

    sdkVer26Implementation 'com.android.support:appcompat-v7:26.1.0'

    implementation 'net.freehaven.tor.control:jtorctl:0.2'

    implementation "com.android.support:appcompat-v7:${appcompatVersion}"

    implementation 'org.slf4j:slf4j-api:1.7.25'

    implementation 'org.slf4j:slf4j-android:1.7.25'