Skip to content

Commit 2edcc90

Browse files
authored
Merge pull request #7 from wiryadev/update
Update Gradle version and dependencies
2 parents 1dcbcb2 + f584c59 commit 2edcc90

6 files changed

Lines changed: 25 additions & 31 deletions

File tree

android-viewbinding/build.gradle

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@ plugins {
44
}
55

66
android {
7-
compileSdkVersion 30
8-
buildToolsVersion "30.0.2"
7+
compileSdkVersion 32
98

109
defaultConfig {
1110
minSdkVersion 19
12-
targetSdkVersion 30
13-
versionCode 1
14-
versionName "1.0"
11+
targetSdkVersion 32
1512

1613
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1714
consumerProguardFiles "consumer-rules.pro"
@@ -40,18 +37,17 @@ dependencies {
4037
/**
4138
* Core Dependencies
4239
*/
43-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
44-
implementation 'androidx.core:core-ktx:1.3.2'
45-
implementation 'androidx.appcompat:appcompat:1.2.0'
46-
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
47-
implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
48-
implementation "com.google.android.material:material:1.2.1"
40+
implementation 'androidx.core:core-ktx:1.7.0'
41+
implementation 'androidx.appcompat:appcompat:1.4.1'
42+
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"
43+
implementation "androidx.lifecycle:lifecycle-common-java8:2.4.1"
44+
implementation "com.google.android.material:material:1.5.0"
4945

5046

5147
/**
5248
* Testing Dependencies
5349
*/
54-
testImplementation 'junit:junit:4.13.1'
55-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
56-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
50+
testImplementation 'junit:junit:4.13.2'
51+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
52+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
5753
}

app/build.gradle

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdkVersion 30
8-
buildToolsVersion "30.0.2"
7+
compileSdkVersion 32
98

109
defaultConfig {
1110
applicationId "sample.viewbinding.android"
1211
minSdkVersion 23
13-
targetSdkVersion 30
12+
targetSdkVersion 32
1413
versionCode 1
1514
versionName "1.0"
1615

@@ -38,11 +37,10 @@ android {
3837
dependencies {
3938
implementation project(":android-viewbinding")
4039

41-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
42-
implementation 'androidx.core:core-ktx:1.3.2'
43-
implementation 'androidx.appcompat:appcompat:1.2.0'
44-
implementation 'com.google.android.material:material:1.2.1'
45-
testImplementation 'junit:junit:4.13.1'
46-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
47-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
40+
implementation 'androidx.core:core-ktx:1.7.0'
41+
implementation 'androidx.appcompat:appcompat:1.4.1'
42+
implementation 'com.google.android.material:material:1.5.0'
43+
testImplementation 'junit:junit:4.13.2'
44+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
45+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
4846
}

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
android:supportsRtl="true"
1111
android:theme="@style/Theme.AndroidViewbinding">
1212

13-
<activity android:name=".activity.SampleActivity">
13+
<activity android:name=".activity.SampleActivity"
14+
android:exported="true">
1415
<intent-filter>
1516
<action android:name="android.intent.action.MAIN" />
1617
<category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/sample/viewbinding/android/activity/SampleActivityFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package sample.viewbinding.android.activity
33
import android.os.Bundle
44
import android.viewbinding.library.activity.viewBinding
55
import androidx.appcompat.app.AppCompatActivity
6-
import sample.viewbinding.android.R
76
import sample.viewbinding.android.databinding.ActivityFragmentSampleBinding
87
import sample.viewbinding.android.fragment.SampleFragment
98

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = "1.4.10"
3+
ext.kotlin_version = "1.6.10"
44
repositories {
55
google()
6-
jcenter()
6+
mavenCentral()
77
}
88
dependencies {
9-
classpath "com.android.tools.build:gradle:4.1.0"
9+
classpath 'com.android.tools.build:gradle:7.1.1'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
@@ -17,7 +17,7 @@ buildscript {
1717
allprojects {
1818
repositories {
1919
google()
20-
jcenter()
20+
mavenCentral()
2121
}
2222
}
2323

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

0 commit comments

Comments
 (0)