Skip to content
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.

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

Bump AGP and gradle #796

Merged
merged 2 commits into from
May 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 0 additions & 25 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.4.1'
classpath("com.github.triplet.gradle:play-publisher:2.0.0-rc1")
}
}
Expand All @@ -24,9 +24,9 @@ allprojects {
version gitVersion()

repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
google()
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Thu Nov 08 02:52:41 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
4 changes: 1 addition & 3 deletions opentasks-provider/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ dependencies {
testImplementation deps.hamcrest

androidTestImplementation project(':opentaskspal')
androidTestImplementation(deps.contenttestpal) {
exclude module: 'jems'
}
androidTestImplementation deps.contenttestpal
androidTestImplementation deps.support_annotations
androidTestImplementation deps.support_test_runner
androidTestImplementation deps.support_test_rules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -435,10 +435,11 @@ public HashMap<Long, Boolean> getState()
@Override
public void onClick(View v)
{
Cursor cursor = (Cursor) getItem((Integer) v.getTag());
Integer position = (Integer) v.getTag();
Cursor cursor = (Cursor) getItem(position);
if (cursor != null)
{
onEditListClick(new Account(cursor.getString(accountNameColumn), cursor.getString(accountTypeColumn)), cursor.getLong(mRowIDColumn),
onEditListClick(new Account(cursor.getString(accountNameColumn), cursor.getString(accountTypeColumn)), getItemId(position),
cursor.getString(listNameColumn), cursor.getInt(listColorColumn));
}
}
Expand Down
7 changes: 4 additions & 3 deletions opentaskspal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ dependencies {
api(deps.contentpal) {
exclude module: 'jems'
}
implementation deps.support_appcompat

implementation deps.datetime
implementation deps.lib_recur
implementation deps.jems
implementation deps.bolts_color

testImplementation(deps.contentpal_testing) {
exclude module: 'jems'
}
testImplementation deps.contentpal_testing
testImplementation deps.jems_testing
testImplementation deps.robolectric
testImplementation deps.junit
testImplementation deps.mockito
Expand Down