Skip to content

Commit

Permalink
Modernize some libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
Hexik committed Nov 10, 2023
1 parent 18f2397 commit 15d68b9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

android {
compileSdk 34
buildToolsVersion '33.0.2'
buildToolsVersion = '34.0.0'
signingConfigs {
release {
storeFile file(keystoreProperties['storeFile'])
Expand Down Expand Up @@ -57,7 +57,7 @@ android {
excludeFilter = file("$rootDir/gradle/config/excludeFilter.xml")
}

applicationVariants.all { variant ->
applicationVariants.configureEach { variant ->
variant.resValue "string", "versionName", gitVersionName
}

Expand Down Expand Up @@ -196,7 +196,7 @@ android {
}

dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
Expand All @@ -207,7 +207,7 @@ dependencies {
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
implementation 'androidx.core:core-splashscreen:1.0.1'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.9.0'
ext.kotlin_version = '1.9.20'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.android.tools.build:gradle:8.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.ajoberstar:grgit:1.7.2"
// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -21,11 +21,11 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}

tasks.withType(Test) {
tasks.withType(Test).configureEach {
testLogging {
exceptionFormat "full"
events "started", "skipped", "passed", "failed"
Expand Down
4 changes: 2 additions & 2 deletions iap/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ plugins {

android {
compileSdk 34
buildToolsVersion '33.0.2'

defaultConfig {
minSdk 16
minSdk 21
targetSdk 34
}

Expand All @@ -34,6 +33,7 @@ android {
}
namespace 'com.aemerse.iap'
ndkVersion '25.2.9519653'
buildToolsVersion = '34.0.0'
}

dependencies {
Expand Down

0 comments on commit 15d68b9

Please sign in to comment.