From 14a1bc56264cdfc254267d176cc5ca9f885d1971 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 28 May 2018 22:03:56 +0300
Subject: [PATCH] Fixed crash caused by trebuchet listing "cannon" as upgrade,
 but the cannon doesn't exist yet 0_0

---
 android/assets/jsons/Techs.json                 | 2 +-
 android/assets/jsons/Units.json                 | 4 ++--
 android/build.gradle                            | 4 ++--
 android/src/com/unciv/game/AndroidLauncher.java | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json
index 0624b6bf..0144cdc1 100644
--- a/android/assets/jsons/Techs.json
+++ b/android/assets/jsons/Techs.json
@@ -15,7 +15,7 @@
 			},
 			{
 				name:"Archery",
-				row:5
+				row:7
 			},
 			{
 				name:"Mining",
diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json
index 6fe16429..d5c52a15 100644
--- a/android/assets/jsons/Units.json
+++ b/android/assets/jsons/Units.json
@@ -130,8 +130,8 @@
 		rangedStrength:14,
 		cost: 120,
 		requiredTech:"Physics",
-		obsoleteTech:"Chemistry",
-		upgradesTo:"Cannon",
+		/*obsoleteTech:"Chemistry",
+		upgradesTo:"Cannon",*/
 		uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility"],
 		hurryCostModifier:20
 	},
diff --git a/android/build.gradle b/android/build.gradle
index e15265e0..c94654ae 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 65
-        versionName "2.2.5"
+        versionCode 67
+        versionName "2.2.7"
     }
     buildTypes {
         release {
diff --git a/android/src/com/unciv/game/AndroidLauncher.java b/android/src/com/unciv/game/AndroidLauncher.java
index b6ab5e38..c213d598 100644
--- a/android/src/com/unciv/game/AndroidLauncher.java
+++ b/android/src/com/unciv/game/AndroidLauncher.java
@@ -4,12 +4,13 @@ import android.os.Bundle;
 
 import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
+import com.unciv.UnCivGame;
 
 public class AndroidLauncher extends AndroidApplication {
 	@Override
 	protected void onCreate (Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
-		initialize(new com.unciv.UnCivGame(), config);
+		initialize(new UnCivGame(), config);
 	}
 }