update SDK target to 25
This commit is contained in:
		
							parent
							
								
									673e6c8af7
								
							
						
					
					
						commit
						e801eaa27a
					
				| 
						 | 
				
			
			@ -1,8 +1,8 @@
 | 
			
		|||
apply plugin: 'com.android.library'
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    compileSdkVersion 23
 | 
			
		||||
    buildToolsVersion "23.0.3"
 | 
			
		||||
    compileSdkVersion 25
 | 
			
		||||
    buildToolsVersion "25"
 | 
			
		||||
 | 
			
		||||
    sourceSets {
 | 
			
		||||
        main {
 | 
			
		||||
| 
						 | 
				
			
			@ -12,7 +12,7 @@ android {
 | 
			
		|||
 | 
			
		||||
    defaultConfig {
 | 
			
		||||
        minSdkVersion 9
 | 
			
		||||
        targetSdkVersion 23
 | 
			
		||||
        targetSdkVersion 25
 | 
			
		||||
        versionCode 1
 | 
			
		||||
        versionName "1.0"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,14 +1,13 @@
 | 
			
		|||
apply plugin: 'com.android.application'
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    compileSdkVersion 23
 | 
			
		||||
    buildToolsVersion "23.0.2"
 | 
			
		||||
    compileSdkVersion 25
 | 
			
		||||
    buildToolsVersion "25"
 | 
			
		||||
 | 
			
		||||
    defaultConfig {
 | 
			
		||||
        applicationId "org.torproject.android"
 | 
			
		||||
        minSdkVersion 16
 | 
			
		||||
        targetSdkVersion 23
 | 
			
		||||
 | 
			
		||||
        targetSdkVersion 25
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    lintOptions {
 | 
			
		||||
| 
						 | 
				
			
			@ -28,7 +27,7 @@ android {
 | 
			
		|||
 | 
			
		||||
dependencies {
 | 
			
		||||
    compile project(':orbotservice')
 | 
			
		||||
    compile 'com.android.support:support-v4:23.4.0'
 | 
			
		||||
    compile 'com.android.support:appcompat-v7:23.4.0'
 | 
			
		||||
    compile 'com.android.support:design:23.4.0'
 | 
			
		||||
    compile 'com.android.support:support-v4:25.0.0'
 | 
			
		||||
    compile 'com.android.support:appcompat-v7:25.0.0'
 | 
			
		||||
    compile 'com.android.support:design:25.0.0'
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,8 +1,8 @@
 | 
			
		|||
apply plugin: 'com.android.library'
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    compileSdkVersion 23
 | 
			
		||||
    buildToolsVersion "23.0.2"
 | 
			
		||||
    compileSdkVersion 25
 | 
			
		||||
    buildToolsVersion "25"
 | 
			
		||||
 | 
			
		||||
    defaultConfig {
 | 
			
		||||
        minSdkVersion 8
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,8 +1,8 @@
 | 
			
		|||
apply plugin: 'com.android.library'
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    compileSdkVersion 23
 | 
			
		||||
    buildToolsVersion "23.0.3"
 | 
			
		||||
    compileSdkVersion 25
 | 
			
		||||
    buildToolsVersion "25"
 | 
			
		||||
 | 
			
		||||
    sourceSets {
 | 
			
		||||
        main {
 | 
			
		||||
| 
						 | 
				
			
			@ -11,8 +11,8 @@ android {
 | 
			
		|||
    }
 | 
			
		||||
 | 
			
		||||
    defaultConfig {
 | 
			
		||||
        minSdkVersion 9
 | 
			
		||||
        targetSdkVersion 23
 | 
			
		||||
        minSdkVersion 16
 | 
			
		||||
        targetSdkVersion 25
 | 
			
		||||
        versionCode 1
 | 
			
		||||
        versionName "1.0"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -28,7 +28,7 @@ android {
 | 
			
		|||
dependencies {
 | 
			
		||||
    compile project(':jsocksAndroid')
 | 
			
		||||
    compile project(':RootCommands')
 | 
			
		||||
    compile 'com.android.support:appcompat-v7:23.4.0'
 | 
			
		||||
    compile 'com.android.support:appcompat-v7:25.0.0'
 | 
			
		||||
    compile fileTree(dir: 'libs', include: ['*.jar','*.so'])
 | 
			
		||||
    testCompile 'junit:junit:4.12'
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue