Skip to content

Commit

Permalink
Update pkgs + cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Externius committed Oct 29, 2023
1 parent e811a15 commit c6d9509
Show file tree
Hide file tree
Showing 20 changed files with 275 additions and 403 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: gradle

Expand Down
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 11 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
buildToolsVersion '33.0.0'
compileSdk 34
defaultConfig {
applicationId "externius.rdmg"
minSdkVersion 19
targetSdkVersion 33
versionCode 36
versionName '1.0.32'
minSdkVersion 23
targetSdk 34
versionCode 37
versionName '1.0.33'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
proguardFiles 'proguard-rules.pro'
multiDexEnabled = false
Expand All @@ -21,15 +20,15 @@ android {
}
productFlavors {
}
tasks.withType(Test) {
tasks.withType(Test).configureEach {
testLogging {
events 'passed', 'skipped', 'failed', 'standardOut', 'standardError'
showStandardStreams true
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
packagingOptions {
resources {
Expand All @@ -41,8 +40,8 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.annotation:annotation:1.6.0'
androidTestImplementation 'androidx.annotation:annotation:1.6.0'
implementation 'androidx.annotation:annotation:1.7.0'
androidTestImplementation 'androidx.annotation:annotation:1.7.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
Expand All @@ -51,7 +50,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.material:material:1.10.0'
testImplementation 'junit:junit:4.13.2'
implementation 'org.hamcrest:hamcrest-library:2.2'
implementation 'com.google.code.gson:gson:2.10.1'
Expand Down
Loading

0 comments on commit c6d9509

Please sign in to comment.