Skip to content

Commit 355b44a

Browse files
committed
chore: upgrade to appcompat 1.7
1 parent 6998247 commit 355b44a

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

app/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdk 33
4+
namespace 'com.linchaolong.android.imagepicker.demo'
5+
compileSdk 34
56
defaultConfig {
67
applicationId "com.linchaolong.android.imagepicker.demo"
7-
minSdkVersion 14
8-
targetSdkVersion 33
8+
minSdkVersion 21
9+
targetSdkVersion 34
910
versionCode 1
1011
versionName "1.0"
1112
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -19,7 +20,7 @@ android {
1920
}
2021
dependencies {
2122
implementation fileTree(dir: 'libs', include: ['*.jar'])
22-
implementation 'androidx.appcompat:appcompat:1.0.0'
23+
implementation 'androidx.appcompat:appcompat:1.7.0'
2324
implementation 'com.facebook.fresco:fresco:1.1.0'
2425
// implementation 'com.linchaolong.android:imagepicker:1.5'
2526
implementation project(path: ':library')

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.linchaolong.android.imagepicker.demo">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.INTERNET" />
76
<!-- 仅用与测试, 项目中不要使用该权限, Google Play不允许 -->

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ buildscript {
55
google()
66
mavenCentral()
77
}
8+
ext.kotlin_version = '1.8.22'
89
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.4.2'
10+
classpath 'com.android.tools.build:gradle:8.1.4'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1012
}
1113
}
1214

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-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

library/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'maven-publish'
3+
apply plugin: 'kotlin-android'
34

45
android {
5-
compileSdk 33
6+
namespace 'com.linchaolong.android.imagepicker'
7+
compileSdk 34
68

79
defaultConfig {
8-
minSdkVersion 14
9-
targetSdkVersion 33
10+
minSdkVersion 21
11+
targetSdkVersion 34
1012
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1113
}
1214

@@ -48,7 +50,7 @@ afterEvaluate {
4850

4951
dependencies {
5052
implementation fileTree(dir: 'libs', include: ['*.jar'])
51-
implementation 'androidx.appcompat:appcompat:1.0.0'
53+
implementation 'androidx.appcompat:appcompat:1.7.0'
5254

5355
testImplementation "junit:junit:4.13.2"
5456
androidTestImplementation "androidx.test.ext:junit:1.1.5"

library/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.linchaolong.android.imagepicker">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<uses-permission android:name="android.permission.CAMERA"/>
54
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"

0 commit comments

Comments
 (0)