Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed unnecessary bits of configuration #1470

Merged
merged 1 commit into from
Oct 14, 2021
+4 −21
Merged

removed unnecessary bits of configuration #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
removed unnecessary bits of configuration
  • Loading branch information
@malmstein
malmstein committed Oct 7, 2021
commit c94020b5e659e1c186d64614b32ea179c5b5d7e8
8 changes: 2 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ android {
ndkVersion '21.0.6113669'
defaultConfig {
applicationId "com.duckduckgo.mobile.android"
minSdkVersion min_sdk
targetSdkVersion target_sdk
minSdk min_sdk
targetSdk target_sdk
versionCode buildVersionCode()
versionName buildVersionName()
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -48,9 +48,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
signingConfigs {
release
}
Expand Down Expand Up @@ -141,7 +138,6 @@ dependencies {

implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation Kotlin.stdlib.jdk7
implementation KotlinX.coroutines.core
implementation KotlinX.coroutines.android
androidTestImplementation(KotlinX.coroutines.test) {
Expand Down
9 changes: 0 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
def versionPropsFile = file('versions.properties')
Properties versionProps = new Properties()

if (versionPropsFile.canRead()) {
versionProps.load(new FileInputStream(versionPropsFile))
}

ext.kotlin_version = versionProps['version.kotlin']
ext.spotless = "5.14.0"
ext.anvil_version = "2.3.3"

ext.min_sdk = 21
ext.target_sdk = 30
ext.compile_sdk = 30
ext.tools_build_version = "30.0.3"

repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotless"
classpath "com.squareup.anvil:gradle-plugin:$anvil_version"

Expand Down
8 changes: 2 additions & 6 deletions gradle/android-library.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ apply from: "$rootDir/spotless.gradle"

android {
compileSdkVersion compile_sdk
buildToolsVersion tools_build_version

defaultConfig {
minSdkVersion min_sdk
targetSdkVersion target_sdk
minSdk min_sdk
targetSdk target_sdk
versionCode 1
versionName "1.0"

Expand All @@ -41,9 +40,6 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
viewBinding = true
}
Expand Down