Updated Kotlin to 1.6.21 and gradle to 7.4.2

badoo · Aug 14, 2022 · ce510d9 · ce510d9
1 parent 01b1e16
commit ce510d9
Show file tree

Hide file tree

Showing 30 changed files with 326 additions and 379 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,9 +18,14 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
       - uses: gradle/wrapper-validation-action@v1
-      - uses: gradle/gradle-build-action@v2
+      - name: "Build project & run tests"
+        uses: gradle/gradle-build-action@v2
         with:
           arguments: build
+      - name: "Verify publishing"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publishToMavenLocal
       - name: Upload failure artifacts
         if: failure()
         uses: actions/upload-artifact@v3

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,6 @@
 .idea
 /local.properties
 .DS_Store
-/build
+build
 /captures
 .externalNativeBuild
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 ### Pending changes
 
-No pending changes
+#### Additions
+
+([#162](https://github.com/badoo/MVICore/pull/162)):
+Updated Kotlin to 1.6.21 (the plan is to update to 1.7.x fairly soon)
 
 ### 1.3.1
 

diff --git a/binder/build.gradle b/binder/build.gradle
@@ -1,21 +1,8 @@
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'kotlin'
-apply plugin: 'org.jetbrains.dokka'
-
-group = 'com.github.badoo.mvicore'
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-    }
-}
-
-repositories {
-    jcenter()
+plugins {
+    id 'java'
+    id 'mvi-core-publish-java'
+    id 'kotlin'
+    id 'org.jetbrains.dokka'
 }
 
 dependencies {
@@ -38,18 +25,3 @@ compileKotlin {
         jvmTarget = JavaVersion.VERSION_1_8
     }
 }
-
-task packageSources(type: Jar, dependsOn: 'classes') {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-task packageJavadoc(type: Jar, dependsOn: javadoc) {
-    from javadoc.outputDirectory
-    classifier = 'javadoc'
-}
-
-artifacts {
-    archives packageSources
-    archives packageJavadoc
-}
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = '1.3.72'
+    ext.kotlinVersion = '1.6.21'
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.0"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        // TODO: Dokka 1.6.21 fails when running publishToMavenLocal. Try aligning with Kotlin version after we upgrade to 1.7.x
+        // Downgrade was suggested here: https://github.com/Kotlin/dokka/issues/2452
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.10"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -30,13 +31,13 @@ ext {
     rxAndroidVersion = '2.1.1'
 
     // DI
-    daggerVersion = '2.29.1'
+    daggerVersion = '2.43.2'
 
     // Utils
     debugDrawerVersion = '0.9.0'
     timberVersion = '4.7.1'
     scalpelVersion = '1.1.2'
-    glideVersion = '4.11.0'
+    glideVersion = '4.13.2'
 
     // Network
     okhttpVersion = '3.10.0'
@@ -111,14 +112,6 @@ ext {
     }
 }
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven { url 'https://jitpack.io' }
-    }
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,5 @@
+jdk:
+  - openjdk11
+install:
+  - echo "Building artifacts"
+  - ./gradlew clean publishToMavenLocal
diff --git a/mvicore-android/build.gradle b/mvicore-android/build.gradle
@@ -1,15 +1,17 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka'
-apply plugin: 'com.github.dcendents.android-maven'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'org.jetbrains.dokka'
+    id 'mvi-core-publish-android'
+}
 
 group='com.github.badoo.mvicore'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -51,31 +53,3 @@ dependencies {
 
     implementation project(":mvicore")
 }
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-sourceSets {
-    main {
-        java {}
-    }
-}
-
-task packageSources(type: Jar, dependsOn: 'classes') {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-artifacts {
-    archives packageSources
-}
diff --git a/mvicore-debugdrawer/build.gradle b/mvicore-debugdrawer/build.gradle
@@ -1,15 +1,17 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka'
-apply plugin: 'com.github.dcendents.android-maven'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'org.jetbrains.dokka'
+    id 'mvi-core-publish-android'
+}
 
 group='com.github.badoo.mvicore'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -53,28 +55,3 @@ dependencies {
 
     implementation project(':mvicore')
 }
-
-buildscript {
-    repositories {
-        jcenter()
-        maven { url 'https://jitpack.io' }
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-    }
-}
-
-sourceSets {
-    main {
-        java {}
-    }
-}
-
-task packageSources(type: Jar, dependsOn: 'classes') {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-artifacts {
-    archives packageSources
-}
diff --git a/mvicore-demo/mvicore-demo-app/build.gradle b/mvicore-demo/mvicore-demo-app/build.gradle
@@ -1,14 +1,15 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+}
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.badoo.mvicoredemo"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -30,6 +31,10 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {

diff --git a/mvicore-demo/mvicore-demo-app/src/main/AndroidManifest.xml b/mvicore-demo/mvicore-demo-app/src/main/AndroidManifest.xml
@@ -19,7 +19,8 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".ui.launcher.LauncherActivity">
+            android:name=".ui.launcher.LauncherActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -29,15 +30,18 @@
 
         <activity
             android:name=".ui.login.LoginActivity"
-            android:theme="@style/AppTheme" />
+            android:theme="@style/AppTheme"
+            android:exported="false" />
 
         <activity
             android:name=".ui.main.MainActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="false" />
 
         <activity
             android:name=".ui.lifecycle.LifecycleDemoActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="false" />
     </application>
 
 </manifest>
diff --git a/...vicore-demo-app/src/main/java/com/badoo/mvicoredemo/ui/lifecycle/LifecycleDemoActivity.kt b/...vicore-demo-app/src/main/java/com/badoo/mvicoredemo/ui/lifecycle/LifecycleDemoActivity.kt
@@ -10,24 +10,23 @@ import com.badoo.binder.named
 import com.badoo.mvicore.android.lifecycle.CreateDestroyBinderLifecycle
 import com.badoo.mvicore.android.lifecycle.ResumePauseBinderLifecycle
 import com.badoo.mvicore.android.lifecycle.StartStopBinderLifecycle
-import com.badoo.mvicoredemo.R
+import com.badoo.mvicoredemo.databinding.ActivityLifecycleDemoBinding
 import init
 import io.reactivex.functions.Consumer
 import io.reactivex.subjects.PublishSubject
-import kotlinx.android.synthetic.main.activity_main.drawerLayout
-import kotlinx.android.synthetic.main.activity_main.navigationView
-import kotlinx.android.synthetic.main.activity_main.toolbar
 
 class LifecycleDemoActivity : AppCompatActivity() {
 
     private val events = PublishSubject.create<String>()
     private val dummyConsumer = Consumer<String> {
         Log.d("LifecycleDemo", it)
     }
+    private lateinit var binding: ActivityLifecycleDemoBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_lifecycle_demo)
+        binding = ActivityLifecycleDemoBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         Binder(CreateDestroyBinderLifecycle(lifecycle))
             .bind(events to dummyConsumer named "Lifecycle#CreateDestroy")
@@ -43,15 +42,15 @@ class LifecycleDemoActivity : AppCompatActivity() {
     }
 
     private fun setupDrawer() {
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        navigationView.init(drawerLayout, 1)
+        binding.navigationView.init(binding.drawerLayout, 1)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             android.R.id.home -> {
-                drawerLayout.openDrawer(GravityCompat.START)
+                binding.drawerLayout.openDrawer(GravityCompat.START)
                 true
             }
             else -> super.onOptionsItemSelected(item)

diff --git a/mvicore-demo/mvicore-demo-app/src/main/java/com/badoo/mvicoredemo/ui/login/LoginActivity.kt b/mvicore-demo/mvicore-demo-app/src/main/java/com/badoo/mvicoredemo/ui/login/LoginActivity.kt
@@ -1,17 +1,17 @@
 package com.badoo.mvicoredemo.ui.login
 
 import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import com.badoo.mvicoredemo.R
 import com.badoo.mvicoredemo.auth.login
-import kotlinx.android.synthetic.main.activity_login.signIn
 
 class LoginActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
 
-        signIn.setOnClickListener { login() }
+        findViewById<View>(R.id.signIn).setOnClickListener { login() }
     }
 }