Updated libraries to latest versions.

KaoStazos · Sep 10, 2018 · 0e13c9f · 0e13c9f
1 parent f6ba45d
commit 0e13c9f
Show file tree

Hide file tree

Showing 21 changed files with 57 additions and 358 deletions.
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/dictionaries/dean.xml b/.idea/dictionaries/dean.xml
diff --git a/.idea/dictionaries/deanh.xml b/.idea/dictionaries/deanh.xml
diff --git a/build.gradle b/build.gradle
@@ -8,10 +8,11 @@ buildscript {
  maven {
  url 'https://maven.google.com'
  }
+ google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0'
- classpath 'com.google.gms:google-services:3.1.0'
+ classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath 'com.google.gms:google-services:4.1.0'
  }
 }
 

diff --git a/client/build.gradle b/client/build.gradle
@@ -19,13 +19,13 @@ if (signingPropsFile.isFile()) {
 }
 
 android {
- compileSdkVersion 26
- buildToolsVersion "26.0.2"
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
 
  defaultConfig {
  applicationId "au.com.codeka.warworlds2"
  minSdkVersion 19
- targetSdkVersion 26
+ targetSdkVersion 27
  versionCode getVersionCodeFromGit()
  versionName "2.0"
  }
@@ -92,15 +92,16 @@ def getVersionCodeFromGit() {
 }
 
 dependencies {
- compile 'com.android.support:appcompat-v7:26.1.0'
- compile 'com.android.support:design:26.1.0'
- compile 'com.android.support:preference-v7:26.1.0'
- compile 'com.google.android.gms:play-services-base:11.4.2'
- compile 'com.google.firebase:firebase-core:11.4.2'
- compile 'com.google.firebase:firebase-messaging:11.4.2'
- compile 'com.google.guava:guava:22.0-android'
- compile 'com.squareup.picasso:picasso:2.5.2'
- compile project(':common')
+ implementation 'com.android.support:appcompat-v7:27.1.0'
+ implementation 'com.android.support:design:27.1.0'
+ implementation 'com.android.support:preference-v7:27.1.0'
+ implementation 'com.google.android.gms:play-services-base:15.0.1'
+ implementation 'com.google.firebase:firebase-core:16.0.3'
+ implementation 'com.google.firebase:firebase-messaging:17.3.1'
+ implementation 'com.google.guava:guava:22.0-android'
+ implementation 'com.squareup.picasso:picasso:2.71828'
+ implementation 'com.squareup.wire:wire-runtime:2.1.2'
+ implementation project(':common')
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/client/src/main/java/au/com/codeka/warworlds/client/ctrl/PlanetListSimple.java b/client/src/main/java/au/com/codeka/warworlds/client/ctrl/PlanetListSimple.java
@@ -119,7 +119,7 @@ private View getPlanetRowView(LayoutInflater inflater, Planet planet, int planet
  View view = inflater.inflate(R.layout.ctrl_planet_list_simple_row, this, false);
 
  final ImageView icon = (ImageView) view.findViewById(R.id.starfield_planet_icon);
- Picasso.with(getContext())
+ Picasso.get()
  .load(ImageHelper.getPlanetImageUrl(getContext(), star, planetIndex, 32, 32))
  .into(icon);
 
@@ -157,7 +157,7 @@ private View getEmpireRowView(LayoutInflater inflater, long empireID) {
 
  Empire empire = EmpireManager.i.getEmpire(empireID);
  if (empire != null) {
- Picasso.with(getContext())
+ Picasso.get()
  .load(ImageHelper.getEmpireImageUrl(getContext(), empire, 32, 32))
  .into(icon);
 

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/game/build/BottomPaneContentView.java b/client/src/main/java/au/com/codeka/warworlds/client/game/build/BottomPaneContentView.java
@@ -8,3 +8,4 @@
 public interface BottomPaneContentView {
  void refresh(Star star);
 }
+
diff --git a/client/src/main/java/au/com/codeka/warworlds/client/game/build/BuildLayout.java b/client/src/main/java/au/com/codeka/warworlds/client/game/build/BuildLayout.java
@@ -124,7 +124,7 @@ public void refreshColonyDetails(Colony colony) {
  }
  checkNotNull(planet);
 
- Picasso.with(getContext())
+ Picasso.get()
  .load(ImageHelper.getPlanetImageUrl(getContext(), star, planet.index, 64, 64))
  .into(planetIcon);
  planetName.setText(String.format(Locale.US, "%s %s", star.name,