Skip to content

Commit 2a57e93

Browse files
committed
Update tools and copyright
1 parent 0e80948 commit 2a57e93

14 files changed

+23
-24
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ git:
55
before_script:
66
- echo sdk.dir $ANDROID_HOME > local.properties
77
script:
8+
- jdk_switcher use oraclejdk8
89
- export TERM=dumb
910
- export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
1011
- ./gradlew build
1112
android:
1213
components:
1314
- platform-tools
1415
- tools
15-
- build-tools-23.0.2
16-
- android-23
16+
- build-tools-25.0.2
17+
- android-25
1718
- extra-android-m2repository
1819
before_cache:
1920
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

build.gradle

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
buildscript {
1818
repositories {
19-
mavenCentral()
19+
jcenter()
2020
}
2121
dependencies {
22-
classpath 'com.android.tools.build:gradle:1.5.0'
22+
classpath 'com.android.tools.build:gradle:2.3.1'
2323
}
2424
}
2525

@@ -42,10 +42,7 @@ String getMyVersionName() {
4242

4343
int getMyVersionCode() {
4444
def stdout = new ByteArrayOutputStream()
45-
exec {
46-
commandLine 'git', 'rev-list', '--count', "HEAD"
47-
standardOutput = stdout
48-
}
45+
exec { commandLine 'git', 'rev-list', '--count', "HEAD"; standardOutput = stdout }
4946
return Integer.parseInt(stdout.toString().trim())
5047
}
5148

@@ -54,14 +51,14 @@ repositories {
5451
}
5552

5653
dependencies {
57-
compile 'org.microg:unifiednlp-api:1.5.3'
54+
compile 'org.microg:unifiednlp-api:1.5.6'
5855
compile 'com.squareup.wire:wire-runtime:1.5.0'
5956
compile 'org.osmdroid:osmdroid-android:5.1'
6057
}
6158

6259
android {
63-
compileSdkVersion 23
64-
buildToolsVersion "23.0.2"
60+
compileSdkVersion 25
61+
buildToolsVersion "25.0.2"
6562

6663
defaultConfig {
6764
versionName getMyVersionName()
@@ -71,6 +68,7 @@ android {
7168
lintOptions {
7269
disable 'InvalidPackage'
7370
disable 'ManifestResource'
71+
abortOnError false
7472
}
7573
}
7674

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
# limitations under the License.
1515
#
1616

17-
#Wed Jan 14 11:55:04 CET 2015
17+
#Sat Apr 22 15:09:21 CEST 2017
1818
distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
~ Copyright 2013-2016 microG Project Team
3+
~ Copyright (C) 2013-2017 microG Project Team
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.

src/main/java/org/microg/nlp/backend/apple/BackendService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2016 microG Project Team
2+
* Copyright (C) 2013-2017 microG Project Team
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/microg/nlp/backend/apple/LocationRetriever.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2016 microG Project Team
2+
* Copyright (C) 2013-2017 microG Project Team
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/microg/nlp/backend/apple/PregrabActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2016 microG Project Team
2+
* Copyright (C) 2013-2017 microG Project Team
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/microg/nlp/backend/apple/Request.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2016 microG Project Team
2+
* Copyright (C) 2013-2017 microG Project Team
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/microg/nlp/backend/apple/Response.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2016 microG Project Team
2+
* Copyright (C) 2013-2017 microG Project Team
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/microg/nlp/backend/apple/VerifyingWifiLocationCalculator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2016 microG Project Team
2+
* Copyright (C) 2013-2017 microG Project Team
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/org/microg/nlp/backend/apple/WifiLocationDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2016 microG Project Team
2+
* Copyright (C) 2013-2017 microG Project Team
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/res/layout/pregrab.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<!--
4-
~ Copyright 2013-2016 microG Project Team
4+
~ Copyright (C) 2013-2017 microG Project Team
55
~
66
~ Licensed under the Apache License, Version 2.0 (the "License");
77
~ you may not use this file except in compliance with the License.

src/main/res/values-sr/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
~ Copyright 2013-2016 microG Project Team
3+
~ Copyright (C) 2013-2017 microG Project Team
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.

src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
~ Copyright 2013-2016 microG Project Team
3+
~ Copyright (C) 2013-2017 microG Project Team
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)