diff options
| author | Alexander Marchuk <alexm@maps.me> | 2015-10-16 13:15:35 +0300 |
|---|---|---|
| committer | Alexander Marchuk <alexm@maps.me> | 2015-10-16 14:04:42 +0300 |
| commit | e6bed3882411a00bf1dcb8085adbbf980a328537 (patch) | |
| tree | 5500db1f40fbce48a1d04a5dcfbd768108a77e8a | |
| parent | 888aa5166eb201ee2748869e9d7478c033c74d8a (diff) | |
[android] fix: Altered version of Gson replaced with stock one.
| -rw-r--r-- | android/3rd_party/gson-altered-2.2.4.jar | bin | 202543 -> 0 bytes | |||
| -rw-r--r-- | android/build.gradle | 2 | ||||
| -rw-r--r-- | android/src/com/mapswithme/maps/MwmApplication.java | 2 | ||||
| -rw-r--r-- | android/src/com/mapswithme/util/sharing/SharingTarget.java | 2 | ||||
| -rw-r--r-- | data/copyright.html | 3 |
5 files changed, 7 insertions, 2 deletions
diff --git a/android/3rd_party/gson-altered-2.2.4.jar b/android/3rd_party/gson-altered-2.2.4.jar Binary files differdeleted file mode 100644 index 382a0a1acc..0000000000 --- a/android/3rd_party/gson-altered-2.2.4.jar +++ /dev/null diff --git a/android/build.gradle b/android/build.gradle index 2722e59a69..b7ddaa0b39 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -11,6 +11,7 @@ buildscript { allprojects { repositories { jcenter() + mavenCentral() } } @@ -31,6 +32,7 @@ dependencies { compile 'com.facebook.android:facebook-android-sdk:4.6.0' compile 'com.parse.bolts:bolts-android:1.2.1' compile 'com.parse:parse-android:1.10.2' + compile 'com.google.code.gson:gson:2.4' compile fileTree(dir: '3rd_party', include: '*.jar') // BottomSheet compile project(":3rd_party:BottomSheet") diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index dd793893e7..df5f148a49 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -8,7 +8,7 @@ import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; -import com.google.gsonaltered.Gson; +import com.google.gson.Gson; import com.mapswithme.country.ActiveCountryTree; import com.mapswithme.country.CountryItem; import com.mapswithme.maps.ads.LikesManager; diff --git a/android/src/com/mapswithme/util/sharing/SharingTarget.java b/android/src/com/mapswithme/util/sharing/SharingTarget.java index bf5ce9368d..efa4c45b41 100644 --- a/android/src/com/mapswithme/util/sharing/SharingTarget.java +++ b/android/src/com/mapswithme/util/sharing/SharingTarget.java @@ -6,7 +6,7 @@ import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; import android.text.TextUtils; -import com.google.gsonaltered.annotations.SerializedName; +import com.google.gson.annotations.SerializedName; import com.mapswithme.util.Gsonable; public class SharingTarget implements Gsonable, Comparable<SharingTarget> diff --git a/data/copyright.html b/data/copyright.html index af5a5926d3..f1d0943b7b 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -167,6 +167,9 @@ <li><a href="https://github.com/BoltsFramework">Bolts Framework</a><br> © 2013-present, Facebook, Inc.; <a href="#bsd3-license" class="license">BSD License</a></li> + <li class="android"><a href="https://github.com/google/gson">Gson</a><br> + © 2008 Google Inc.; <a href="#apache2-license" class="license">Apache License</a></li> + <li class="android"><a href="https://github.com/serso/android-linear-layout-manager">Linear Layout Manager</a><br> © 2014 serso aka se.solovyev; <a href="#apache2-license" class="license">Apache License</a></li> </ul> |