Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler authored and cketti committed Dec 7, 2022
1 parent ac8b71d commit 4b05677
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 91 deletions.
Empty file removed .gitmodules
Empty file.
1 change: 0 additions & 1 deletion app/html-cleaner/.gitignore

This file was deleted.

15 changes: 5 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCompile

buildscript {
ext {
buildConfig = [
'robolectricSdk': 31
]

// Judging the impact of newer library versions on the app requires being intimately familiar with the code
// base. Please don't open pull requests upgrading dependencies if you're a new contributor.
versions = [
Expand Down Expand Up @@ -61,13 +57,12 @@ buildscript {
]

javaVersion = JavaVersion.VERSION_1_8
kotlinJvmVersion = "1.8"
}

repositories {
mavenCentral()
google()
maven { url "https://plugins.gradle.org/m2/" }
gradlePluginPortal()
}

dependencies {
Expand All @@ -82,7 +77,7 @@ project.ext {
testCoverage = project.hasProperty('testCoverage')
}

subprojects {
allprojects {
configurations.all {
resolutionStrategy.dependencySubstitution {
substitute module("androidx.core:core") using module("androidx.core:core:${versions.androidxCore}")
Expand Down Expand Up @@ -118,8 +113,8 @@ subprojects {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility javaVersion
targetCompatibility javaVersion
}

lintOptions {
Expand Down Expand Up @@ -153,7 +148,7 @@ subprojects {

tasks.withType(KotlinCompile) {
kotlinOptions {
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
jvmTarget = javaVersion
}
}

Expand Down
1 change: 0 additions & 1 deletion cli/html-cleaner-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ application {
dependencies {
implementation project(':app:html-cleaner')

implementation "org.jetbrains.kotlin:kotlin-stdlib"
implementation "com.github.ajalt.clikt:clikt:3.4.0"
implementation "com.squareup.okio:okio:${versions.okio}"
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ android.useAndroidX=true
android.enableJetifier=false
android.nonTransitiveRClass=true

org.gradle.jvmargs=-Xmx1400m
org.gradle.jvmargs=-Xmx1400m -Dfile.encoding=UTF-8
org.gradle.parallel=true
org.gradle.caching=true
2 changes: 0 additions & 2 deletions mail/common/src/main/AndroidManifest.xml

This file was deleted.

2 changes: 0 additions & 2 deletions mail/protocols/imap/src/main/AndroidManifest.xml

This file was deleted.

2 changes: 0 additions & 2 deletions mail/protocols/pop3/src/main/AndroidManifest.xml

This file was deleted.

2 changes: 0 additions & 2 deletions mail/protocols/smtp/src/main/AndroidManifest.xml

This file was deleted.

2 changes: 0 additions & 2 deletions mail/protocols/webdav/src/main/AndroidManifest.xml

This file was deleted.

2 changes: 0 additions & 2 deletions mail/testing/src/main/AndroidManifest.xml

This file was deleted.

33 changes: 0 additions & 33 deletions plugins/openpgp-api-lib/.gitignore

This file was deleted.

33 changes: 0 additions & 33 deletions plugins/openpgp-api-lib/openpgp-api/.gitignore

This file was deleted.

0 comments on commit 4b05677

Please sign in to comment.