File tree 9 files changed +40
-41
lines changed 9 files changed +40
-41
lines changed Original file line number Diff line number Diff line change @@ -13,8 +13,8 @@ android:
13
13
components :
14
14
- platform-tools # latest SDK platform-tools
15
15
- tools # latest SDK tools
16
- - android-24 # SDK version used to compile the project
17
- - build-tools-26.0.1 # build tools used by the project
16
+ - android-23 # SDK version used to compile the project
17
+ - build-tools-26.0.2 # minimum build tools required by Android Gradle plugin 3.0.1
18
18
- extra-android-support
19
19
- extra-android-m2repository
20
20
Original file line number Diff line number Diff line change 8
8
</configuration >
9
9
</facet >
10
10
</component >
11
- <component name =" NewModuleRootManager" LANGUAGE_LEVEL =" JDK_1_7 " inherit-compiler-output =" true" >
11
+ <component name =" NewModuleRootManager" LANGUAGE_LEVEL =" JDK_1_8 " inherit-compiler-output =" true" >
12
12
<content url =" file://$MODULE_DIR$" >
13
13
<excludeFolder url =" file://$MODULE_DIR$/.gradle" />
14
14
</content >
Original file line number Diff line number Diff line change 2
2
3
3
buildscript {
4
4
repositories {
5
+ google()
5
6
jcenter()
6
7
}
7
8
dependencies {
8
- classpath ' com.android.tools.build:gradle:2.3.3'
9
-
9
+ classpath ' com.android.tools.build:gradle:3.0.1'
10
10
// NOTE: Do not place your application dependencies here; they belong
11
11
// in the individual module build.gradle files
12
12
}
13
13
}
14
14
15
15
allprojects {
16
16
repositories {
17
+ google()
17
18
jcenter()
18
19
}
19
20
}
Original file line number Diff line number Diff line change 5
5
# any settings specified in this file.
6
6
7
7
# For more details on how to configure your build environment visit
8
- # https ://www.gradle.org/docs/current/userguide/build_environment.html
8
+ # http ://www.gradle.org/docs/current/userguide/build_environment.html
9
9
10
10
# Specifies the JVM arguments used for the daemon process.
11
11
# The setting is particularly useful for tweaking memory settings.
12
- # Default value: -Xmx10248m -XX:MaxPermSize=256m
13
- # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
12
+ org.gradle.jvmargs =-Xmx1536m
14
13
15
14
# When configured, Gradle will run in incubating parallel mode.
16
15
# This option should only be used with decoupled projects. More details, visit
17
- # https ://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18
- # org.gradle.parallel=true
16
+ # http ://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
17
+ # org.gradle.parallel=true
Original file line number Diff line number Diff line change 1
- # Fri Mar 03 16:11 :43 PST 2017
1
+ # Fri Dec 08 14:12 :43 PST 2017
2
2
distributionBase =GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
6
- distributionUrl =https\://services.gradle.org/distributions/gradle-3.3 -all.zip
6
+ distributionUrl =https\://services.gradle.org/distributions/gradle-4.1 -all.zip
Original file line number Diff line number Diff line change 1
1
apply plugin : ' com.android.application'
2
2
3
3
android {
4
- compileSdkVersion 24
5
- buildToolsVersion ' 26.0.1'
4
+ compileSdkVersion 23
6
5
defaultConfig {
7
6
applicationId ' gov.nasa.worldwindx.examples'
8
- minSdkVersion 16
9
- targetSdkVersion 24
7
+ minSdkVersion 23
8
+ targetSdkVersion 23
10
9
versionCode 10
11
10
versionName ' 0.8.0-SNAPSHOT'
12
11
}
@@ -22,18 +21,15 @@ android {
22
21
abortOnError false
23
22
disable ' GradleDependency'
24
23
}
25
- }
26
-
27
- repositories {
28
- flatDir dirs : ' libs '
24
+ compileOptions {
25
+ sourceCompatibility JavaVersion . VERSION_1_8
26
+ targetCompatibility JavaVersion . VERSION_1_8
27
+ }
29
28
}
30
29
31
30
dependencies {
32
- compile fileTree(include : [' *.jar' ], dir : ' libs' )
33
31
compile project(' :worldwind' )
34
- compile ' mil-sym-android:renderer:0.1.2@aar'
35
- // maven-like dependency from flatDir repo; alternative: compile(name: 'renderer', ext: 'aar')
36
- compile ' com.android.support:appcompat-v7:24.2.1'
37
- compile ' com.android.support:design:24.2.1'
38
- testCompile ' junit:junit:4.12'
32
+ compile ' com.android.support:appcompat-v7:23.4.0'
33
+ compile ' com.android.support:design:23.4.0'
34
+ compile ' mil.army.missioncommand:mil-sym-android-renderer:0.1.36'
39
35
}
Original file line number Diff line number Diff line change 1
1
apply plugin : ' com.android.application'
2
2
3
3
android {
4
- compileSdkVersion 24
5
- buildToolsVersion ' 26.0.1'
4
+ compileSdkVersion 23
6
5
defaultConfig {
7
6
applicationId ' gov.nasa.worldwindx.tutorials'
8
- minSdkVersion 16
9
- targetSdkVersion 24
7
+ minSdkVersion 23
8
+ targetSdkVersion 23
10
9
versionCode 10
11
10
versionName ' 0.8.0-SNAPSHOT'
12
11
}
@@ -22,12 +21,14 @@ android {
22
21
abortOnError false
23
22
disable ' GradleDependency'
24
23
}
24
+ compileOptions {
25
+ sourceCompatibility JavaVersion . VERSION_1_8
26
+ targetCompatibility JavaVersion . VERSION_1_8
27
+ }
25
28
}
26
29
27
30
dependencies {
28
- compile fileTree(include : [' *.jar' ], dir : ' libs' )
29
31
compile project(' :worldwind' )
30
- testCompile ' junit:junit:4.12'
31
- compile ' com.android.support:appcompat-v7:24.2.1'
32
- compile ' com.android.support:design:24.2.1'
32
+ compile ' com.android.support:appcompat-v7:23.4.0'
33
+ compile ' com.android.support:design:23.4.0'
33
34
}
Original file line number Diff line number Diff line change @@ -14,12 +14,10 @@ apply plugin: 'maven-publish'
14
14
apply plugin : ' com.jfrog.artifactory'
15
15
16
16
android {
17
- compileSdkVersion 24
18
- buildToolsVersion ' 26.0.1'
19
-
17
+ compileSdkVersion 23
20
18
defaultConfig {
21
19
minSdkVersion 16
22
- targetSdkVersion 24
20
+ targetSdkVersion 23
23
21
versionCode 10
24
22
versionName ' 0.8.0-SNAPSHOT'
25
23
testInstrumentationRunner ' android.support.test.runner.AndroidJUnitRunner'
@@ -42,12 +40,14 @@ android {
42
40
abortOnError false
43
41
disable ' GradleDependency'
44
42
}
43
+ compileOptions {
44
+ sourceCompatibility JavaVersion . VERSION_1_8
45
+ targetCompatibility JavaVersion . VERSION_1_8
46
+ }
45
47
}
46
48
47
49
dependencies {
48
- compile ' com.android.support:support-annotations:24.+'
49
- androidTestCompile ' com.android.support.test:runner:0.5'
50
- androidTestCompile ' com.android.support.test:rules:0.5'
50
+ compile ' com.android.support:support-annotations:27.0.2'
51
51
testCompile ' junit:junit:4.12'
52
52
testCompile ' org.mockito:mockito-core:2.0.43-beta'
53
53
// PowerMockito is required to mock static methods like Logger.log
@@ -59,6 +59,8 @@ dependencies {
59
59
exclude module : ' hamcrest-core'
60
60
exclude module : ' objenesis'
61
61
}
62
+ androidTestCompile ' com.android.support.test:runner:1.0.1'
63
+ androidTestCompile ' com.android.support.test:rules:1.0.1'
62
64
}
63
65
64
66
publishing {
You can’t perform that action at this time.
0 commit comments