From 09265f2e8334214394a08457bd75d6f881c557d1 Mon Sep 17 00:00:00 2001 From: ankbis Date: Tue, 7 May 2019 14:22:45 +0530 Subject: [PATCH] gradle and other library version updated --- app/build.gradle | 14 ++------------ .../view/adapter/viewHolders/RepoListViewHolder.kt | 2 +- .../view/ui/repodetail/RepoDetailFragment.kt | 4 ++-- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d49fceb..694a02d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,15 +25,11 @@ android { } } -androidExtensions { - experimental = true -} - dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.0-beta01' - implementation 'androidx.constraintlayout:constraintlayout:1.1.2' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha04' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' // Navigation component implementation "android.arch.navigation:navigation-fragment:$rootProject.nav_version" // use -ktx for Kotlin @@ -55,10 +51,4 @@ dependencies { // Databinding compiler kapt 'com.android.databinding:compiler:3.2.0-alpha10' -} - -kotlin { - experimental { - coroutines "enable" - } } \ No newline at end of file diff --git a/app/src/main/java/com/ankit/trendinggit/view/adapter/viewHolders/RepoListViewHolder.kt b/app/src/main/java/com/ankit/trendinggit/view/adapter/viewHolders/RepoListViewHolder.kt index ee75297..85acbe5 100644 --- a/app/src/main/java/com/ankit/trendinggit/view/adapter/viewHolders/RepoListViewHolder.kt +++ b/app/src/main/java/com/ankit/trendinggit/view/adapter/viewHolders/RepoListViewHolder.kt @@ -10,7 +10,7 @@ import com.ankit.trendinggit.view.ui.repolist.RepoListViewModel import com.squareup.picasso.Picasso import kotlinx.android.synthetic.main.view_repo_list_item.view.* import org.jetbrains.anko.bundleOf -import org.jetbrains.anko.sdk25.coroutines.onClick +import org.jetbrains.anko.sdk27.coroutines.onClick class RepoListViewHolder constructor(private val dataBinding: ViewDataBinding, private val repoListViewModel: RepoListViewModel) : RecyclerView.ViewHolder(dataBinding.root) { diff --git a/app/src/main/java/com/ankit/trendinggit/view/ui/repodetail/RepoDetailFragment.kt b/app/src/main/java/com/ankit/trendinggit/view/ui/repodetail/RepoDetailFragment.kt index 82da1c3..d3a62fa 100644 --- a/app/src/main/java/com/ankit/trendinggit/view/ui/repodetail/RepoDetailFragment.kt +++ b/app/src/main/java/com/ankit/trendinggit/view/ui/repodetail/RepoDetailFragment.kt @@ -12,7 +12,7 @@ import android.webkit.WebViewClient import androidx.fragment.app.Fragment import com.ankit.trendinggit.R import kotlinx.android.synthetic.main.fragment_repo_detail.* -import org.jetbrains.anko.sdk25.coroutines.onClick +import org.jetbrains.anko.sdk27.coroutines.onClick class RepoDetailFragment : Fragment() { @@ -23,7 +23,7 @@ class RepoDetailFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val url = RepoDetailFragmentArgs.fromBundle(arguments).url + val url = arguments?.let { RepoDetailFragmentArgs.fromBundle(it).url } setupWebView() setClickListeners() diff --git a/build.gradle b/build.gradle index 01bb197..e3f4e62 100644 --- a/build.gradle +++ b/build.gradle @@ -2,17 +2,17 @@ buildscript { ext{ - kotlin_version = '1.2.60' - nav_version = '1.0.0-alpha04' - workVersion = '1.0.0-alpha04' - anko_version = '0.10.5' + kotlin_version = '1.3.21' + nav_version = '1.0.0' + workVersion = '1.0.1' + anko_version = '0.10.8' } repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0-alpha05' + classpath 'com.android.tools.build:gradle:3.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:$nav_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d9841e0..fb5c1e4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 10 11:47:35 IST 2018 +#Tue May 07 12:47:37 IST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip