Skip to content

Commit

Permalink
chore: Update dependencies and android/gradle versions
Browse files Browse the repository at this point in the history
  • Loading branch information
qk7b committed Oct 1, 2024
1 parent 30dc983 commit b740c79
Show file tree
Hide file tree
Showing 9 changed files with 252 additions and 158 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ And this to your module `build.gradle`

```groovy
dependencies {
compile 'com.github.quentin7b:android-gero:1.0.0'
compile 'com.github.quentin7b:android-gero:1.3.2'
}
```

Expand Down
21 changes: 11 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ plugins {
}

android {
compileSdkVersion 31
buildToolsVersion "30.0.3"
compileSdk 34
buildToolsVersion = "35.0.0"

defaultConfig {
namespace 'com.github.quentin7b.android.gero.demo'
applicationId "com.github.quentin7b.android.gero"
minSdkVersion 16
targetSdkVersion 31
minSdkVersion 21
targetSdkVersion 35
versionCode 1
versionName "1.0"

Expand All @@ -35,12 +36,12 @@ android {
dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_version"
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation project(path: ':gero')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
android:supportsRtl="true"
android:theme="@style/Theme.Gero">

<activity android:name=".SplashActivity">
<activity android:name=".SplashActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
9 changes: 7 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.5.31"
ext {
kotlin_version = "1.9.22"
gradle_version = '8.5.0'
// Add other versions here
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "com.android.tools.build:gradle:$gradle_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
11 changes: 6 additions & 5 deletions gero/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ plugins {
}

android {
compileSdkVersion 31
buildToolsVersion "30.0.3"
namespace 'com.github.quentin7b.android.gero'
compileSdk 34
buildToolsVersion = "35.0.0"

defaultConfig {
minSdkVersion 16
targetSdkVersion 31
targetSdkVersion 35

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -33,7 +34,7 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
api 'org.mozilla:rhino:1.7.13'
}

Expand All @@ -48,7 +49,7 @@ afterEvaluate {
// You can then customize attributes of the publication as shown below.
groupId = 'com.github.quentin7b'
artifactId = 'android-gero'
version = '1.3.1'
version = '1.3.2'
}
}
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Fri Jul 16 15:03:56 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b740c79

Please sign in to comment.