Skip to content

Commit fa9b868

Browse files
committed
升级编译环境,解决导致其他库打包失败的问题
1 parent e38d46c commit fa9b868

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

app/build.gradle

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 32
4+
compileSdkVersion 34
55
buildToolsVersion '30.0.0'
66

77
defaultConfig {
88
applicationId "com.hss01248.dialogutildemo"
9-
minSdkVersion 19
10-
targetSdkVersion 32
9+
minSdkVersion 23
10+
targetSdkVersion 34
1111
versionCode 1
1212
versionName "1.0"
1313
multiDexEnabled true
@@ -40,26 +40,25 @@ repositories {
4040
};
4141

4242
maven {
43-
url "http://dl.bintray.com/lukaville/maven"
43+
url "https://dl.bintray.com/lukaville/maven"
4444
}
4545

4646

4747
/* maven { url "http://dl.bintray.com/dodola/maven" }*/
4848
}
4949
dependencies {
50-
compile fileTree(dir: 'libs', include: ['*.jar'])
51-
testCompile 'junit:junit:4.12'
50+
5251
implementation 'androidx.appcompat:appcompat:1.0.0'
5352
implementation 'androidx.recyclerview:recyclerview:1.0.0'
5453
implementation 'com.google.android.material:material:1.0.0'
55-
compile 'com.jakewharton:butterknife:10.2.1'
54+
implementation 'com.jakewharton:butterknife:10.2.1'
5655
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
5756
//compile 'com.github.rubensousa:BottomSheetBuilder:1.3'
58-
compile project(path: ':dialog')
57+
implementation project(path: ':dialog')
5958
//debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
6059
// releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
61-
compile 'com.github.hss01248:Mylog:1.0.1'
62-
compile 'com.alibaba:fastjson:1.1.54.android'
60+
implementation 'com.github.hss01248:Mylog:1.0.1'
61+
implementation 'com.alibaba:fastjson:1.1.54.android'
6362
}
6463

6564
configurations {

app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:supportsRtl="true"
1111
android:name=".BaseApp"
1212
android:theme="@style/AppTheme">
13-
<activity android:name=".MainActivity">
13+
<activity android:name=".MainActivity" android:exported="true">
1414
<intent-filter>
1515
<action android:name="android.intent.action.MAIN" />
1616

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/dev/remote3.gradle'
4-
apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/master/deps/depsLastestChecker.gradle'
5-
apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/dev/z_config/git_branch_info.gradle'
3+
apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/gradle7_5/remote3.gradle'
4+
apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/gradle7_5/deps/depsLastestChecker.gradle'
5+
apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/gradle7_5/z_config/git_branch_info.gradle'
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:4.1.0'
8+
classpath 'com.android.tools.build:gradle:7.1.2'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

dialog/build.gradle

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 32
4+
compileSdkVersion 34
55
resourcePrefix "dialogutil_"
66

77
defaultConfig {
8-
minSdkVersion 16
9-
targetSdkVersion 32
8+
minSdkVersion 23
9+
targetSdkVersion 34
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -39,8 +39,7 @@ repositories {
3939
}
4040

4141
dependencies {
42-
compile fileTree(dir: 'libs', include: ['*.jar'])
43-
testCompile 'junit:junit:4.12'
42+
4443
implementation 'androidx.appcompat:appcompat:1.0.0'
4544
implementation 'androidx.recyclerview:recyclerview:1.0.0'
4645
implementation 'com.google.android.material:material:1.0.0'

dialog/src/main/res/values/styles.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<style name="Dialog.FullScreen" parent="Theme.AppCompat.Light.Dialog">
1717
<!--Theme.AppCompat.Dialog-->
1818
<item name="android:windowNoTitle">true</item>
19-
<item name="android:windowBackground">#FFFFFF</item>
19+
<item name="android:windowBackground">@color/cardBodyColor</item>
2020
<item name="android:windowIsFloating">false</item>
2121
</style>
2222

gradle/wrapper/gradle-wrapper.properties

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

0 commit comments

Comments
 (0)