Skip to content

Support new Android Studio and Gradle versions #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahrukhqasim wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support new Android Studio and Gradle versions #122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14fdc27
Update gradle versions with respect to new version
shahrukhqasim Apr 5, 2017
fc317a3
Add gradle wrapper for portability
shahrukhqasim Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenLocal()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.1.0'
classpath 'com.android.tools.build:gradle:2.3.0'
}
}

Expand Down Expand Up @@ -54,7 +54,7 @@ android {
* The obvious way to fix this would be allow wildcards (ie, "22.+") but
* Android have explicitly said that they won't do this.
*/
compileSdkVersion 22
buildToolsVersion '21.1.2'
compileSdkVersion 25
Copy link
Member

@roubert roubert Apr 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit message does not mention anything about changing the SDK version. Is this change intentional? If it is, it should be explained the the commit message why it's being done.

buildToolsVersion "25.0.2"
}

6 changes: 3 additions & 3 deletions android/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<!-- Gradle generates an <instrumentation> block during the build process,
but in order to work with other build systems, that don't do that,
there must be such a block declared here. -->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.i18n.addressinput.test" />
<!--<instrumentation-->
Copy link
Member

@roubert roubert Apr 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not look good. Either this block is no longer necessary, in which case it should be deleted together with the comment explaining its purpose and the commit message updated to explain why it's no longer necessary, or else it should not be commented out.

<!--android:name="android.test.InstrumentationTestRunner"-->
<!--android:targetPackage="com.android.i18n.addressinput.test" />-->

<uses-permission android:name="android.permission.INTERNET" />

Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ allprojects {
mavenLocal()
}
}

Copy link
Member

@roubert roubert Apr 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a mistake. (Or is there really a reason for why it's an improvement to add a blank line here?)