Skip to content

Commit 153ac7e

Browse files
committed
base on 1.30.2
1 parent 9e56a1f commit 153ac7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3212
-2689
lines changed

app/build.gradle

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

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.3"
4+
compileSdkVersion 30
65

76
defaultConfig {
87
applicationId "com.thomas.core.demo"
98
minSdkVersion 21
10-
targetSdkVersion 29
9+
targetSdkVersion 30
1110
versionCode 1
1211
versionName "1.0"
1312
}
@@ -23,6 +22,8 @@ android {
2322
dependencies {
2423
implementation fileTree(dir: "libs", include: ["*.jar"])
2524
implementation 'androidx.appcompat:appcompat:1.2.0'
26-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
25+
implementation 'com.google.android.material:material:1.2.1'
26+
implementation 'androidx.constraintlayout:constraintlayout:2.0.3'
27+
implementation project(path: ':lib')
2728

2829
}

app/src/main/java/com/thomas/core/demo/MainActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44

55
import androidx.appcompat.app.AppCompatActivity;
66

7+
import com.thomas.core.ToastUtils;
8+
79
public class MainActivity extends AppCompatActivity {
810

911
@Override
1012
protected void onCreate(Bundle savedInstanceState) {
1113
super.onCreate(savedInstanceState);
1214
setContentView(R.layout.activity_main);
15+
ToastUtils.showShort("hhhh");
1316
}
1417
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources>
22
<!-- Base application theme. -->
3-
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
3+
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
44
<!-- Customize your theme here. -->
55
<item name="colorPrimary">@color/colorPrimary</item>
66
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
maven { url 'https://jitpack.io' }
88
}
99
dependencies {
10-
classpath "com.android.tools.build:gradle:4.0.1"
10+
classpath 'com.android.tools.build:gradle:4.1.0'
1111
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Aug 12 10:44:23 CST 2020
1+
#Wed Oct 28 09:23:41 CST 2020
22
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.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

lib/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apply plugin: 'com.github.dcendents.android-maven'
33
group = 'com.github.ithomasoft'
44

55
android {
6-
compileSdkVersion 29
6+
compileSdkVersion 30
77

88
defaultConfig {
99
minSdkVersion 19
10-
targetSdkVersion 29
11-
versionCode 2
12-
versionName "1.0.1"
10+
targetSdkVersion 30
11+
versionCode 3
12+
versionName "1.0.2"
1313
consumerProguardFiles "consumer-rules.pro"
1414
}
1515

@@ -29,7 +29,7 @@ android {
2929
}
3030

3131
dependencies {
32-
compileOnly 'com.google.android.material:material:1.2.0'
32+
compileOnly 'com.google.android.material:material:1.2.1'
3333
compileOnly 'androidx.appcompat:appcompat:1.2.0'
3434
compileOnly 'com.google.code.gson:gson:2.8.6'
3535
}

0 commit comments

Comments
 (0)