Skip to content

Commit

Permalink
update gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler committed Aug 14, 2020
1 parent bf37b7f commit 37ffcfc
Show file tree
Hide file tree
Showing 9 changed files with 86 additions and 41 deletions.
1 change: 1 addition & 0 deletions .idea/.name

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

1 change: 0 additions & 1 deletion .idea/gradle.xml

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

36 changes: 36 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

30 changes: 30 additions & 0 deletions .idea/jarRepositories.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/misc.xml

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

21 changes: 12 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "com.abedelazizshe.lightcompressor"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "1.0.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':lightcompressor')

implementation "org.jetbrains.kotlin:kotlin-stdlib:${project.kotlin}"
implementation "androidx.appcompat:appcompat:1.1.0"
implementation "androidx.appcompat:appcompat:${project.appCompat}"
implementation "androidx.core:core-ktx:${project.androidX}"
implementation "androidx.constraintlayout:constraintlayout:${project.constraintlayout}"
implementation "com.google.android.material:material:${project.material}"
Expand All @@ -36,8 +41,6 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${project.coroutines}"
kapt "com.github.bumptech.glide:compiler:${project.glide}"
implementation "com.google.android.exoplayer:exoplayer:${project.exoPlayer}"
implementation project(':lightcompressor')

testImplementation "junit:junit:${project.junit}"
androidTestImplementation "androidx.test.ext:junit:${project.testJunit}"
androidTestImplementation "androidx.test.espresso:espresso-core:${project.espresso}"
Expand Down
21 changes: 0 additions & 21 deletions app/proguard-rules.pro

This file was deleted.

7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ buildscript {
repositories {
google()
jcenter()

}
dependencies {
classpath "com.android.tools.build:gradle:$build_gradle"
Expand All @@ -33,10 +32,10 @@ ext {
espresso = "3.2.0"
androidX = "1.3.1"
constraintlayout = "1.1.3"
material = "1.1.0-alpha07"
material = "1.2.0"
glide = "4.11.0"
exoPlayer = "2.8.4"
exoPlayer = "2.11.7"
coroutines = "1.3.8"
testJunit = "1.1.1"
appCompat = "1.1.0"
appCompat = "1.2.0"
}
8 changes: 3 additions & 5 deletions lightcompressor/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 29


defaultConfig {
minSdkVersion 21
targetSdkVersion 29
Expand All @@ -21,15 +20,14 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib:${project.kotlin}"
implementation "androidx.core:core-ktx:${project.androidX}"
implementation files('libs/isoparser-1.0.6.jar')
implementation files('libs/aspectjrt-1.7.3.jar')
implementation "org.jetbrains.kotlin:kotlin-stdlib:${project.kotlin}"
implementation "androidx.core:core-ktx:${project.androidX}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${project.coroutines}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${project.coroutines}"
testImplementation "junit:junit:${project.junit}"
Expand Down

0 comments on commit 37ffcfc

Please sign in to comment.