Merge pull request #88 from wada811/release/8.0.0

Release 8.0.0

.github/workflows/maven-publish.yml

@@ -11,11 +11,11 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
 
       - name: Publish to MavenCentral
         run: ./gradlew --max-workers 1 publishReleasePublicationToMavenLocal publishReleasePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository

DataBinding-ktx/build.gradle

@@ -9,24 +9,24 @@ apply from: "${rootDir}/publish-module.gradle"
 
 android {
     namespace "com.wada811.databindingktx"
-    compileSdkVersion 33
+    compileSdk 34
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdk 21
+        targetSdk 34
     }
     buildFeatures {
         dataBinding true
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0"
     implementation 'androidx.fragment:fragment-ktx:1.8.1'
 }

DataBinding-ktx/src/main/java/com/wada811/databindingktx/FragmentDataBinding.kt

@@ -6,7 +6,6 @@ import android.view.View
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
-import com.wada811.databindingktx.R
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty
 
@@ -25,7 +24,7 @@ fun <T : ViewDataBinding> Fragment.dataBinding(): ReadOnlyProperty<Fragment, T>
     }
 }
 
-fun <T : ViewDataBinding> Fragment.withBinding(withBinding: (binding: T) -> Unit) {
+inline fun <T : ViewDataBinding> Fragment.withBinding(withBinding: (binding: T) -> Unit) {
     view?.let { view ->
         val binding = DataBindingUtil.bind<T>(view)!!.also {
             it.lifecycleOwner = viewLifecycleOwner

build.gradle

@@ -2,8 +2,8 @@ plugins {
     id 'com.android.application' version '8.5.0' apply false
     id 'com.android.library' version '8.5.0' apply false
     id "com.diffplug.spotless" version "6.25.0" apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
-    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
+    id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
 }
 
 apply from: "${rootDir}/publish-root.gradle"

gradle.properties

@@ -20,15 +20,9 @@ kapt.include.compile.classpath=false
 # Incremental annotation processing in KAPT
 # https://blog.jetbrains.com/kotlin/2019/04/kotlin-1-3-30-released/
 kapt.incremental.apt=true
-# Incremental annotation processing for DataBinding
-# https://developer.android.com/studio/releases/gradle-plugin#incremental_ap
-android.databinding.incremental=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 #android.enableJetifier=true
-# Cacheable unit tests
-# https://developer.android.com/studio/releases/gradle-plugin#cacheable_tests
-android.testConfig.useRelativePath=true

publish-module.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'com.wada811.databindingktx'
     PUBLISH_ARTIFACT_ID = 'databindingktx'
-    PUBLISH_VERSION = '7.0.0'
+    PUBLISH_VERSION = '8.0.0'
 }
 
 android {

sample/build.gradle

@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace "com.wada811.databindingktx.sample"
-    compileSdkVersion 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.wada811.databindingktx.sample"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdk 21
+        targetSdk 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,10 +29,17 @@ android {
     buildFeatures {
         dataBinding true
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0"
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation project(':DataBinding-ktx')
 }