Evolinx/android_terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update gradle, fix building

Browse Source 
Signed-off-by: binkybear <binkybear@nethunter.com>
This commit is contained in:
binkybear 2017-08-31 22:48:01 -05:00
parent ab66be1859
commit 30fe7da03b
6 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle
View File

@ -1,16 +1,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
task wrapper (type:Wrapper) {
gradleVersion = '2.2.1'
distributionUrl = 'https://services.gradle.org/distributions/gradle-2.2.1-all.zip'
gradleVersion = '4.1'
distributionUrl = 'https://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip'
}
buildscript {
repositories {
jcenter()
mavenCentral()
google()
maven {
url "https://maven.google.com"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.0.0-beta3'
}
}

2
gradle.properties
View File

@ -13,4 +13,4 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#Fri Sep 16 18:00:52 CDT 2016
android.useDeprecatedNdk=true
org.gradle.jvmargs=-DsocksProxyHost=127.0.0.1 -DsocksProxyPort=9090

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Tue Sep 13 18:57:02 CDT 2016
#Thu Aug 31 21:08:59 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-4.1-all.zip

25
libtermexec/build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.3'
}
}
apply plugin: 'com.android.library'
@ -14,7 +14,7 @@ repositories {
android {
compileSdkVersion 25
buildToolsVersion "25"
buildToolsVersion "26.0.1"
defaultConfig {
minSdkVersion 4
@ -23,17 +23,21 @@ android {
versionName "2.0"
ndk {
moduleName 'libjackpal-termexec2nhj1'
abiFilters 'all'
moduleName 'term-N'
abiFilters 'armeabi', 'arm64-v8a', 'armeabi-v7a', 'x86'
ldLibs 'log', 'c'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
sourceSets {
main {
jni.srcDirs = []
}
}
buildTypes {
release {
minifyEnabled false
@ -53,7 +57,6 @@ android.libraryVariants.all { variant ->
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-annotations:21.0.0'
}
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:support-annotations:25.3.0'
}

5
settings.gradle
View File

@ -1,5 +1,2 @@
include ':emulatorview', ':libtermexec'
include ':term'
include ':samples:intents'
include ':samples:pathbroadcasts'
include ':samples:telnet'
include ':term'

28
term/build.gradle
View File

@ -1,31 +1,33 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion '25'
compileSdkVersion 26
buildToolsVersion '26.0.1'
defaultConfig {
applicationId 'com.offsec.nhterm'
minSdkVersion 19
targetSdkVersion 25
minSdkVersion 14
targetSdkVersion 26
ndk {
moduleName "libjackpal-androidterm5nhj1"
abiFilters 'armeabi', 'mips', 'x86'
ldLibs "log"
moduleName "libjackpal-androidterm5"
abiFilters 'armeabi', 'arm64-v8a', 'armeabi-v7a', 'x86'
ldLibs 'log', 'c'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
sourceSets {
main {
jni.srcDirs = []
}
}
buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt')
}
debug {
jniDebuggable true
}
}
productFlavors {
}
@ -34,5 +36,5 @@ android {
dependencies {
compile project(':emulatorview')
compile project(':libtermexec')
compile 'com.android.support:support-v4:24.2.1'
compile "com.android.support:support-v4:+"
}