diff --git a/docs/getting-started-java-android.md b/docs/getting-started-java-android.md
index cd70039..22a6142 100644
--- a/docs/getting-started-java-android.md
+++ b/docs/getting-started-java-android.md
@@ -3,7 +3,7 @@
In addition to the requirements from our [Getting started with Java](getting-started-java.md) guide you'll also need:
* Xamarin.Android 7.4.99 or later (build from [Jenkins](https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/lastSuccessfulBuild/Azure/))
-* [Android Studio 3.x](https://developer.android.com/studio/preview/index.html) with Java 1.8
+* [Android Studio 3.x](https://developer.android.com/studio/index.html) with Java 1.8
As an overview, we will:
* Create a C# Android Library project
@@ -171,7 +171,7 @@ If you are looking for an additional walkthrough, check out this video embedding
## Using Java 1.8
-As of writing this, the best option is to use Android Studio 3.0 beta ([download here](https://developer.android.com/studio/preview/index.html)).
+As of writing this, the best option is to use Android Studio 3.0 ([download here](https://developer.android.com/studio/index.html)).
To enable Java 1.8 in your app module's `build.gradle` file:
```groovy
diff --git a/docs/getting-started-java.md b/docs/getting-started-java.md
index 6bada02..b2f37b6 100644
--- a/docs/getting-started-java.md
+++ b/docs/getting-started-java.md
@@ -17,7 +17,7 @@ For Windows:
For Android:
* Xamarin.Android 7.4.99 or later (build from [Jenkins](https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/lastSuccessfulBuild/Azure/))
-* [Android Studio 3.x](https://developer.android.com/studio/preview/index.html) with Java 1.8
+* [Android Studio 3.x](https://developer.android.com/studio/index.html) with Java 1.8
Optionally you can install [Xamarin Studio](https://developer.xamarin.com/guides/cross-platform/xamarin-studio/) or the new [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) to edit and compile your C# code. The rest of the getting started guide assume you'll be using **Visual Studio for Mac**.
diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle
index a7acd42..a9aeb50 100644
--- a/tests/android/app/build.gradle
+++ b/tests/android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
- buildToolsVersion "26.0.0"
+ buildToolsVersion '26.0.2'
defaultConfig {
applicationId "mono.embeddinator.testrunner"
minSdkVersion 15
@@ -28,9 +28,9 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support:appcompat-v7:25.3.1'
+ compile 'com.android.support:appcompat-v7:25.4.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
- compile 'com.google.android.gms:play-services-games:11.0.4'
+ compile 'com.google.android.gms:play-services-games:11.4.2'
compile 'junit:junit:4.12'
compile project(':managed')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
diff --git a/tests/android/build.gradle b/tests/android/build.gradle
index c5999a8..f93d608 100644
--- a/tests/android/build.gradle
+++ b/tests/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0-beta2'
+ classpath 'com.android.tools.build:gradle:3.0.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties
index 731eecb..49246d5 100644
--- a/tests/android/gradle/wrapper/gradle-wrapper.properties
+++ b/tests/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 14 07:54:40 CDT 2017
+#Thu Oct 26 09:40:23 CDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/tests/managed/android/managed-android.csproj b/tests/managed/android/managed-android.csproj
index b8fde20..10146ec 100644
--- a/tests/managed/android/managed-android.csproj
+++ b/tests/managed/android/managed-android.csproj
@@ -1,6 +1,6 @@
-
+
Debug
AnyCPU
@@ -14,7 +14,7 @@
Resource
Resources
Assets
- true
+ false
true
@@ -42,27 +42,6 @@
-
- ..\..\..\packages\Xamarin.Android.Support.Annotations.25.3.1\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll
-
-
- ..\..\..\packages\Xamarin.Android.Support.Compat.25.3.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll
-
-
- ..\..\..\packages\Xamarin.Android.Support.Core.UI.25.3.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll
-
-
- ..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.3.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll
-
-
- ..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.3.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll
-
-
- ..\..\..\packages\Xamarin.Android.Support.Fragment.25.3.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll
-
-
- ..\..\..\packages\Xamarin.Android.Support.v4.25.3.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll
-
..\..\..\packages\SQLitePCLRaw.core.1.1.7\lib\MonoAndroid\SQLitePCLRaw.core.dll
@@ -93,6 +72,27 @@
..\..\..\packages\Xamarin.GooglePlayServices.Games.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Games.dll
+
+ ..\..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll
+
+
+ ..\..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll
+
+
+ ..\..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll
+
+
+ ..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll
+
+
+ ..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll
+
+
+ ..\..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll
+
+
+ ..\..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll
+
@@ -122,17 +122,16 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/managed/android/packages.config b/tests/managed/android/packages.config
index 505cd7d..3d90095 100644
--- a/tests/managed/android/packages.config
+++ b/tests/managed/android/packages.config
@@ -4,14 +4,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+