From f331fedfcdaaf9c6986562ac2fc639822335ed25 Mon Sep 17 00:00:00 2001 From: k0shk0sh Date: Fri, 16 Feb 2018 19:08:59 +0100 Subject: [PATCH] add lock reason --- app/build.gradle | 8 +- .../fastaccess/data/dao/LockIssuePrModel.java | 14 +++ .../fastaccess/data/service/IssueService.java | 6 +- .../provider/markdown/MarkDownProvider.java | 3 +- .../viewholder/CommitCommentsViewHolder.kt | 2 +- .../viewholder/PullRequestEventViewHolder.kt | 2 +- .../adapter/viewholder/TrendingViewHolder.kt | 2 +- .../locking/LockIssuePrBottomSheetDialog.kt | 46 +++++++++ .../extras/locking/LockIssuePrCallback.kt | 9 ++ .../issue/details/IssuePagerActivity.java | 33 ++++--- .../issues/issue/details/IssuePagerMvp.java | 5 +- .../issue/details/IssuePagerPresenter.java | 17 +++- .../details/PullRequestPagerActivity.java | 23 +++-- .../details/PullRequestPagerMvp.java | 6 +- .../details/PullRequestPagerPresenter.java | 13 ++- .../reviews/changes/ReviewChangesActivity.kt | 6 +- .../layout/lock_issue_pr_dialog.xml | 96 +++++++++++++++++++ app/src/main/res/values/arrays.xml | 8 ++ build.gradle | 5 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 20 files changed, 256 insertions(+), 52 deletions(-) create mode 100644 app/src/main/java/com/fastaccess/data/dao/LockIssuePrModel.java create mode 100644 app/src/main/java/com/fastaccess/ui/modules/repos/extras/locking/LockIssuePrBottomSheetDialog.kt create mode 100644 app/src/main/java/com/fastaccess/ui/modules/repos/extras/locking/LockIssuePrCallback.kt create mode 100644 app/src/main/res/layouts/other_layouts/layout/lock_issue_pr_dialog.xml diff --git a/app/build.gradle b/app/build.gradle index 39695c62..ae519d26 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' apply plugin: 'com.apollographql.android' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' apply plugin: 'com.novoda.build-properties' apply plugin: 'jacoco-android' apply plugin: 'io.fabric' @@ -24,7 +25,7 @@ android { } } compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.fastaccess.github" minSdkVersion 21 @@ -133,7 +134,7 @@ dependencies { implementation 'cn.gavinliu.android.lib:ShapedImageView:0.8.3' implementation "com.jakewharton:butterknife:${butterKnifeVersion}" implementation 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.2' - implementation 'io.reactivex.rxjava2:rxjava:2.1.5' + implementation 'io.reactivex.rxjava2:rxjava:2.1.6' implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0' implementation 'com.annimon:stream:1.1.9' @@ -158,7 +159,7 @@ dependencies { implementation "com.google.android.gms:play-services-base:${gms}" implementation('com.github.b3er.rxfirebase:firebase-database-kotlin:11.2.0') { transitive = false } implementation('com.github.b3er.rxfirebase:firebase-database:11.2.0') { transitive = false } - implementation('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') { transitive = true } + implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') { transitive = true } implementation "com.github.miguelbcr:RxBillingService:0.0.3" implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlin_version}" implementation 'org.jsoup:jsoup:1.10.3' @@ -188,5 +189,4 @@ dependencies { androidTestImplementation "com.android.support.test.espresso:espresso-core:${espresseVersion}" } -apply plugin: 'ManifestClasspath' apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/app/src/main/java/com/fastaccess/data/dao/LockIssuePrModel.java b/app/src/main/java/com/fastaccess/data/dao/LockIssuePrModel.java new file mode 100644 index 00000000..481788b3 --- /dev/null +++ b/app/src/main/java/com/fastaccess/data/dao/LockIssuePrModel.java @@ -0,0 +1,14 @@ +package com.fastaccess.data.dao; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * Created by Kosh on 10.02.18. + */ +@NoArgsConstructor @AllArgsConstructor @Getter @Setter public class LockIssuePrModel { + private boolean locked; + private String activeLockReason; +} diff --git a/app/src/main/java/com/fastaccess/data/service/IssueService.java b/app/src/main/java/com/fastaccess/data/service/IssueService.java index 3b861c6e..d63d7c4b 100644 --- a/app/src/main/java/com/fastaccess/data/service/IssueService.java +++ b/app/src/main/java/com/fastaccess/data/service/IssueService.java @@ -9,6 +9,7 @@ import com.fastaccess.data.dao.CreateIssueModel; import com.fastaccess.data.dao.IssueRequestModel; import com.fastaccess.data.dao.IssuesPageable; import com.fastaccess.data.dao.LabelModel; +import com.fastaccess.data.dao.LockIssuePrModel; import com.fastaccess.data.dao.Pageable; import com.fastaccess.data.dao.model.Comment; import com.fastaccess.data.dao.model.Issue; @@ -68,9 +69,10 @@ public interface IssueService { @Path("number") int number, @Body IssueRequestModel issue); - @Headers("Content-Length: 0") + @Headers("Accept: application/vnd.github.sailor-v-preview+json") @PUT("repos/{owner}/{repo}/issues/{number}/lock") - Observable> lockIssue(@Path("owner") String owner, @Path("repo") String repo, @Path("number") int number); + Observable> lockIssue(@Body LockIssuePrModel body, @Path("owner") String owner, + @Path("repo") String repo, @Path("number") int number); @DELETE("repos/{owner}/{repo}/issues/{number}/lock") Observable> unlockIssue(@Path("owner") String owner, @Path("repo") String repo, @Path("number") int number); diff --git a/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java b/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java index e1f0b2da..b43a3e86 100644 --- a/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java +++ b/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java @@ -41,7 +41,8 @@ public class MarkDownProvider { }; private static final String[] ARCHIVE_EXTENSIONS = { - ".zip", ".7z", ".rar", ".tar.gz", ".tgz", ".tar.Z", ".tar.bz2", ".tbz2", ".tar.lzma", ".tlz", ".apk", ".jar", ".dmg", ".pdf", ".ico", ".docx", ".doc", ".xlsx", ".hwp", ".pptx", ".show", ".mp3", ".ogg" + ".zip", ".7z", ".rar", ".tar.gz", ".tgz", ".tar.Z", ".tar.bz2", ".tbz2", ".tar.lzma", ".tlz", ".apk", ".jar", + ".dmg", ".pdf", ".ico", ".docx", ".doc", ".xlsx", ".hwp", ".pptx", ".show", ".mp3", ".ogg" }; private MarkDownProvider() {} diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitCommentsViewHolder.kt b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitCommentsViewHolder.kt index 974377fa..c80bbd9d 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitCommentsViewHolder.kt +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitCommentsViewHolder.kt @@ -74,7 +74,7 @@ class CommitCommentsViewHolder private constructor(view: View, adapter: BaseRecy name.text = author3.login } else { avatar.setUrl(null, null, false, false) - name.text = null + name.text = "" } if (!InputHelper.isEmpty(t.body)) { val width = adapter?.getRowWidth() ?: 0 diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestEventViewHolder.kt b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestEventViewHolder.kt index 6e2bfb6f..1419abe4 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestEventViewHolder.kt +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestEventViewHolder.kt @@ -68,7 +68,7 @@ class PullRequestEventViewHolder private constructor(view: View, adapter: BaseRe } private fun reset() { - stateText.text = null + stateText.text = "" avatarLayout.setUrl(null, null, false, false) } diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TrendingViewHolder.kt b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TrendingViewHolder.kt index c55acee1..8c151003 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TrendingViewHolder.kt +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TrendingViewHolder.kt @@ -40,7 +40,7 @@ open class TrendingViewHolder(itemView: View, adapter: BaseRecyclerAdapter parentFragment as LockIssuePrCallback + context is LockIssuePrCallback -> context + else -> null + } + } + + override fun onDetach() { + lockIssuePrCallback = null + super.onDetach() + } + + override fun layoutRes(): Int = R.layout.lock_issue_pr_dialog + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + cancel.setOnClickListener { dismiss() } + ok.setOnClickListener { + lockIssuePrCallback?.onLock(lockReason.selectedItem as String) + dismiss() + } + } + + companion object { + fun newInstance() = LockIssuePrBottomSheetDialog() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/locking/LockIssuePrCallback.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/locking/LockIssuePrCallback.kt new file mode 100644 index 00000000..bb088cb3 --- /dev/null +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/locking/LockIssuePrCallback.kt @@ -0,0 +1,9 @@ +package com.fastaccess.ui.modules.repos.extras.locking + +/** + * Created by Kosh on 10.02.18. + */ + +interface LockIssuePrCallback { + fun onLock(reason: String) +} \ No newline at end of file diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java index 731f0265..c2105d18 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java @@ -38,6 +38,7 @@ import com.fastaccess.ui.modules.repos.RepoPagerActivity; import com.fastaccess.ui.modules.repos.RepoPagerMvp; import com.fastaccess.ui.modules.repos.extras.assignees.AssigneesDialogFragment; import com.fastaccess.ui.modules.repos.extras.labels.LabelsDialogFragment; +import com.fastaccess.ui.modules.repos.extras.locking.LockIssuePrBottomSheetDialog; import com.fastaccess.ui.modules.repos.extras.milestone.create.MilestoneDialogFragment; import com.fastaccess.ui.modules.repos.issues.create.CreateIssueActivity; import com.fastaccess.ui.modules.repos.issues.issue.details.timeline.IssueTimelineFragment; @@ -190,13 +191,17 @@ public class IssuePagerActivity extends BaseActivity(); } + @Override public void onLock(@NonNull String reason) { + getPresenter().onLockUnlockIssue(reason); + } + + private IssueTimelineFragment getIssueTimelineFragment() { + if (pager == null || pager.getAdapter() == null) return null; + return (IssueTimelineFragment) pager.getAdapter().instantiateItem(pager, 0); + } + private void hideShowFab() { if (getPresenter().isLocked() && !getPresenter().isOwner()) { getSupportFragmentManager().beginTransaction().hide(commentEditorFragment).commit(); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerMvp.java index b2e76899..1b75f173 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerMvp.java @@ -13,6 +13,7 @@ import com.fastaccess.ui.base.mvp.BaseMvp; import com.fastaccess.ui.modules.editor.comment.CommentEditorFragment; import com.fastaccess.ui.modules.repos.extras.assignees.AssigneesMvp; import com.fastaccess.ui.modules.repos.extras.labels.LabelsMvp; +import com.fastaccess.ui.modules.repos.extras.locking.LockIssuePrCallback; import java.util.ArrayList; @@ -24,7 +25,7 @@ public interface IssuePagerMvp { interface View extends BaseMvp.FAView, LabelsMvp.SelectedLabelsListener, AssigneesMvp.SelectedAssigneesListener, IssuePrCallback, - CommentEditorFragment.CommentListener { + CommentEditorFragment.CommentListener, LockIssuePrCallback { void onSetupIssue(boolean isUpdate); void showSuccessIssueActionMsg(boolean isClose); @@ -62,7 +63,7 @@ public interface IssuePagerMvp { void onOpenCloseIssue(); - void onLockUnlockIssue(); + void onLockUnlockIssue(String reason); void onPutMilestones(@NonNull MilestoneModel milestone); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java index a1578094..bd44d5c0 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java @@ -13,6 +13,7 @@ import com.fastaccess.data.dao.AssigneesRequestModel; import com.fastaccess.data.dao.IssueRequestModel; import com.fastaccess.data.dao.LabelListModel; import com.fastaccess.data.dao.LabelModel; +import com.fastaccess.data.dao.LockIssuePrModel; import com.fastaccess.data.dao.MilestoneModel; import com.fastaccess.data.dao.NotificationSubscriptionBodyModel; import com.fastaccess.data.dao.PullsIssuesParser; @@ -131,7 +132,7 @@ class IssuePagerPresenter extends BasePresenter implements I if (proceedCloseIssue) { onOpenCloseIssue(); } else if (proceedLockUnlock) { - onLockUnlockIssue(); + onLockUnlockIssue(null); } } } @@ -155,15 +156,21 @@ class IssuePagerPresenter extends BasePresenter implements I } } - @Override public void onLockUnlockIssue() { + @Override public void onLockUnlockIssue(String reason) { Issue currentIssue = getIssue(); if (currentIssue == null) return; - String login = currentIssue.getUser().getLogin(); - String repoId = currentIssue.getRepoId(); + String login = getLogin(); + String repoId = getRepoId(); int number = currentIssue.getNumber(); + LockIssuePrModel model = null; + if (!isLocked() && !InputHelper.isEmpty(reason)) { + model = new LockIssuePrModel(true, reason); + } IssueService issueService = RestProvider.getIssueService(isEnterprise()); Observable> observable = RxHelper - .getObservable(isLocked() ? issueService.unlockIssue(login, repoId, number) : issueService.lockIssue(login, repoId, number)); + .getObservable(model == null + ? issueService.unlockIssue(login, repoId, number) : + issueService.lockIssue(model, login, repoId, number)); makeRestCall(observable, booleanResponse -> { int code = booleanResponse.code(); if (code == 204) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerActivity.java index fab18064..95304888 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerActivity.java @@ -44,6 +44,7 @@ import com.fastaccess.ui.modules.repos.RepoPagerActivity; import com.fastaccess.ui.modules.repos.RepoPagerMvp; import com.fastaccess.ui.modules.repos.extras.assignees.AssigneesDialogFragment; import com.fastaccess.ui.modules.repos.extras.labels.LabelsDialogFragment; +import com.fastaccess.ui.modules.repos.extras.locking.LockIssuePrBottomSheetDialog; import com.fastaccess.ui.modules.repos.extras.milestone.create.MilestoneDialogFragment; import com.fastaccess.ui.modules.repos.issues.create.CreateIssueActivity; import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.files.PullRequestFilesFragment; @@ -205,13 +206,17 @@ public class PullRequestPagerActivity extends BaseActivity(); } + @Override public void onLock(String reason) { + getPresenter().onLockUnlockConversations(reason); + } + protected void hideAndClearReviews() { getPresenter().getCommitComment().clear(); AnimHelper.mimicFabVisibility(false, prReviewHolder, null); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerMvp.java index e21c8324..5e8acfc4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerMvp.java @@ -14,6 +14,7 @@ import com.fastaccess.ui.base.mvp.BaseMvp; import com.fastaccess.ui.modules.editor.comment.CommentEditorFragment; import com.fastaccess.ui.modules.repos.extras.assignees.AssigneesMvp; import com.fastaccess.ui.modules.repos.extras.labels.LabelsMvp; +import com.fastaccess.ui.modules.repos.extras.locking.LockIssuePrCallback; import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerMvp; import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.files.PullRequestFilesMvp; import com.fastaccess.ui.modules.repos.pull_requests.pull_request.merge.MergePullReqeustMvp; @@ -31,7 +32,8 @@ public interface PullRequestPagerMvp { interface View extends BaseMvp.FAView, LabelsMvp.SelectedLabelsListener, AssigneesMvp.SelectedAssigneesListener, MergePullReqeustMvp.MergeCallback, IssuePagerMvp.IssuePrCallback, PullRequestFilesMvp.PatchCallback, - CommentEditorFragment.CommentListener, ReviewChangesMvp.ReviewSubmissionCallback { + CommentEditorFragment.CommentListener, ReviewChangesMvp.ReviewSubmissionCallback, + LockIssuePrCallback { void onSetupIssue(boolean update); @@ -70,7 +72,7 @@ public interface PullRequestPagerMvp { void onOpenCloseIssue(); - void onLockUnlockConversations(); + void onLockUnlockConversations(String reason); @NonNull SpannableBuilder getMergeBy(@NonNull PullRequest pullRequest, @NonNull Context context); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java index db41ba07..5b3d4182 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java @@ -15,6 +15,7 @@ import com.fastaccess.data.dao.CommentRequestModel; import com.fastaccess.data.dao.IssueRequestModel; import com.fastaccess.data.dao.LabelListModel; import com.fastaccess.data.dao.LabelModel; +import com.fastaccess.data.dao.LockIssuePrModel; import com.fastaccess.data.dao.MergeRequestModel; import com.fastaccess.data.dao.MilestoneModel; import com.fastaccess.data.dao.NotificationSubscriptionBodyModel; @@ -128,18 +129,22 @@ class PullRequestPagerPresenter extends BasePresenter if (proceedCloseIssue) { onOpenCloseIssue(); } else if (proceedLockUnlock) { - onLockUnlockConversations(); + onLockUnlockConversations(null); } } } - @Override public void onLockUnlockConversations() { + @Override public void onLockUnlockConversations(String reason) { PullRequest currentPullRequest = getPullRequest(); if (currentPullRequest == null) return; IssueService service = RestProvider.getIssueService(isEnterprise()); + LockIssuePrModel model = null; + if (!isLocked() && !InputHelper.isEmpty(reason)) { + model = new LockIssuePrModel(true, reason); + } Observable> observable = RxHelper - .getObservable(isLocked() ? service.unlockIssue(login, repoId, issueNumber) : - service.lockIssue(login, repoId, issueNumber)); + .getObservable(model == null ? service.unlockIssue(login, repoId, issueNumber) : + service.lockIssue(model, login, repoId, issueNumber)); makeRestCall(observable, booleanResponse -> { int code = booleanResponse.code(); if (code == 204) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt index a03e5952..e04b5fc8 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt @@ -122,11 +122,7 @@ class ReviewChangesActivity : BaseDialogFragment? { diff --git a/app/src/main/res/layouts/other_layouts/layout/lock_issue_pr_dialog.xml b/app/src/main/res/layouts/other_layouts/layout/lock_issue_pr_dialog.xml new file mode 100644 index 00000000..1e206cab --- /dev/null +++ b/app/src/main/res/layouts/other_layouts/layout/lock_issue_pr_dialog.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 44ed7f75..9fe3a9e2 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -154,6 +154,7 @@ ko pl pt-rPT + ar @@ -180,6 +181,13 @@ COMMENT + + off-topic + too heated + resolved + spam + + @array/com_google_android_gms_fonts_certs_dev diff --git a/build.gradle b/build.gradle index 5150b717..2898cfc7 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { butterKnifeVersion = '8.5.1' state_version = '1.1.6' - lombokVersion = '1.16.18' + lombokVersion = '1.16.20' supportVersion = "27.0.2" gms = "11.8.0" thirtyinchVersion = '0.8.0' @@ -23,14 +23,13 @@ buildscript { maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0-alpha09' + classpath 'com.android.tools.build:gradle:3.2.0-alpha03' classpath 'com.google.gms:google-services:3.0.0' classpath 'com.novoda:gradle-build-properties-plugin:0.3' classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2' classpath 'io.fabric.tools:gradle:1.24.1' classpath 'com.apollographql.apollo:gradle-plugin:0.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" - classpath "com.github.viswaramamoorthy:gradle-util-plugins:0.1.0-RELEASE" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f568f8e9..8536732f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Sat Jan 06 10:29:07 CET 2018 +#Fri Feb 16 18:31:07 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip android.enableD8=true