From 4448a460cd4ec04b73d160b453a87d71c92a0e20 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Tue, 19 Apr 2016 01:37:44 +0200 Subject: [PATCH] Update copyright --- unifiednlp-app/build.gradle | 10 +++++++++- unifiednlp-app/src/main/AndroidManifest.xml | 2 +- .../org/microg/nlp/ui/SettingsLauncherActivity.java | 2 +- unifiednlp-base/build.gradle | 2 +- unifiednlp-base/src/main/AndroidManifest.xml | 2 +- .../java/org/microg/nlp/AbstractBackendHelper.java | 2 +- .../java/org/microg/nlp/AbstractProviderService.java | 2 +- .../src/main/java/org/microg/nlp/PackageReceiver.java | 2 +- .../src/main/java/org/microg/nlp/Preferences.java | 2 +- .../src/main/java/org/microg/nlp/Provider.java | 2 +- .../org/microg/nlp/geocode/AbstractGeocodeService.java | 2 +- .../main/java/org/microg/nlp/geocode/BackendFuser.java | 2 +- .../java/org/microg/nlp/geocode/BackendHelper.java | 2 +- .../java/org/microg/nlp/geocode/GeocodeProvider.java | 2 +- .../java/org/microg/nlp/geocode/GeocodeProviderV1.java | 2 +- .../java/org/microg/nlp/geocode/GeocodeServiceV1.java | 2 +- .../microg/nlp/location/AbstractLocationService.java | 2 +- .../java/org/microg/nlp/location/BackendFuser.java | 2 +- .../java/org/microg/nlp/location/BackendHelper.java | 2 +- .../java/org/microg/nlp/location/LocationProvider.java | 2 +- .../org/microg/nlp/location/LocationProviderV1.java | 2 +- .../org/microg/nlp/location/LocationProviderV2.java | 2 +- .../org/microg/nlp/location/LocationServiceV1.java | 2 +- .../org/microg/nlp/location/LocationServiceV2.java | 2 +- .../java/org/microg/nlp/location/ThreadHelper.java | 2 +- .../org/microg/nlp/ui/AbstractBackendPreference.java | 2 +- .../org/microg/nlp/ui/GeocoderBackendPreference.java | 2 +- .../org/microg/nlp/ui/LocationBackendPreference.java | 2 +- .../java/org/microg/nlp/ui/SettingInjectorService.java | 2 +- .../main/java/org/microg/nlp/ui/SettingsActivity.java | 2 +- .../src/main/res/layout/backend_list_entry.xml | 2 +- .../src/main/res/layout/settings_activity.xml | 2 +- unifiednlp-base/src/main/res/values-pl/strings.xml | 2 +- unifiednlp-base/src/main/res/values-ro/strings.xml | 2 +- unifiednlp-base/src/main/res/values-sr/strings.xml | 2 +- unifiednlp-base/src/main/res/values/strings.xml | 2 +- .../src/main/res/xml/nlp_injected_setting.xml | 2 +- unifiednlp-base/src/main/res/xml/nlp_preferences.xml | 2 +- unifiednlp-compat/build.gradle | 2 +- 39 files changed, 47 insertions(+), 39 deletions(-) diff --git a/unifiednlp-app/build.gradle b/unifiednlp-app/build.gradle index 20b74e6..9b74c79 100644 --- a/unifiednlp-app/build.gradle +++ b/unifiednlp-app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 microG Project Team + * Copyright 2013-2016 microG Project Team * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,14 @@ buildscript { apply plugin: 'com.android.application' +/* This is a hack, trying to provide release updates to F-Droid until it can properly handle Gradle +applicationId "org.microg.nlp" +applicationId "com.google.android.gms" +applicationId "com.google.android.location" +versionName "1.6.5" +versionCode "20160" + */ + String getMyVersionName() { def stdout = new ByteArrayOutputStream() if (rootProject.file("gradlew").exists()) diff --git a/unifiednlp-app/src/main/AndroidManifest.xml b/unifiednlp-app/src/main/AndroidManifest.xml index f8a65e0..b48881b 100644 --- a/unifiednlp-app/src/main/AndroidManifest.xml +++ b/unifiednlp-app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@