Skip to content

Commit b4a2dc7

Browse files
authored
Merge pull request #973 from cSploit/refresh5
Update build tools, a few libraries, & MaterialComponents theme
2 parents a2ee9e4 + 1cc2439 commit b4a2dc7

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.3.0-alpha08'
8+
classpath 'com.android.tools.build:gradle:3.3.0-alpha11'
99
}
1010
}
1111

cSploit/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.3.0-alpha08'
7+
classpath 'com.android.tools.build:gradle:3.3.0-alpha11'
88
}
99
}
1010

@@ -21,16 +21,16 @@ dependencies {
2121
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
2222
implementation 'androidx.preference:preference:1.0.0-rc02'
2323
implementation 'androidx.multidex:multidex:2.0.0'
24-
implementation 'com.google.android.material:material:1.0.0-rc01'
24+
implementation 'com.google.android.material:material:1.0.0-rc02'
2525
implementation 'org.apache.commons:commons-compress:1.18'
2626
implementation 'commons-net:commons-net:3.6'
2727
implementation 'com.github.zafarkhaja:java-semver:0.9.0'
2828
implementation 'org.unbescape:unbescape:1.1.6.RELEASE'
2929
implementation 'org.msgpack:msgpack:0.6.12'
3030
implementation 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
3131
implementation 'org.tukaani:xz:1.8'
32-
implementation 'ch.acra:acra-http:5.1.3'
33-
implementation 'ch.acra:acra-notification:5.1.3'
32+
implementation 'ch.acra:acra-http:5.2.0'
33+
implementation 'ch.acra:acra-notification:5.2.0'
3434
testImplementation 'junit:junit:4.12'
3535
}
3636

cSploit/src/main/res/values/style.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
4+
<style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
55
<item name="actionBarStyle">@style/Theme.CSploitActionBarStyle</item>
66
<item name="android:windowBackground">@color/background_window</item>
77
<item name="colorPrimary">@color/app_color</item>
@@ -17,7 +17,7 @@
1717

1818
<!-- this dark theme needs a lot of help and support in the app overall -->
1919

20-
<style name="DarkTheme" parent="Theme.AppCompat">
20+
<style name="DarkTheme" parent="Theme.MaterialComponents">
2121
<item name="actionBarStyle">@style/Theme.CSploitActionBarDarkStyle</item>
2222
<item name="actionModeBackground">@color/app_color_dark</item>
2323
<item name="colorPrimary">@color/selectable_blue_dark</item>

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

0 commit comments

Comments
 (0)