Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
romainguy committed Dec 13, 2023
1 parent f5de29f commit 00bf8ad
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 29 deletions.
10 changes: 10 additions & 0 deletions .idea/deploymentTargetDropDown.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/kotlinc.xml

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

10 changes: 10 additions & 0 deletions .idea/migrations.xml

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

3 changes: 2 additions & 1 deletion .idea/misc.xml

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

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ repositories {
}
dependencies {
implementation 'dev.romainguy:v9:0.2.0'
implementation 'dev.romainguy:v9:0.3.0'
}
```

Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
buildscript {
ext {
compose_version = '1.4.2'
compose_compiler_version = '1.4.6'
pathway_version = '0.12.0'
compose_version = '1.5.4'
compose_compiler_version = '1.5.6'
pathway_version = '0.17.0'
}
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.24.0'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.10'
classpath 'com.android.tools.build:gradle:8.2.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.20'
}
}
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GROUP=dev.romainguy
VERSION_NAME=0.2.0
VERSION_NAME=0.3.0

SONATYPE_HOST=S01
RELEASE_SIGNING_ENABLED=true
Expand All @@ -23,9 +23,8 @@ POM_NAME=v9
POM_ARTIFACT_ID=v9
POM_PACKAGING=aar

org.gradle.jvmargs=-Xmx512M
org.gradle.jvmargs=-Xmx2048M

android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jul 22 12:55:00 PDT 2022
#Tue Dec 12 17:36:28 PST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
26 changes: 15 additions & 11 deletions v9-demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ plugins {
}

android {
compileSdkPreview 'UpsideDownCake'

defaultConfig {
applicationId "dev.romainguy.graphics.v9.demo"
minSdk 28
targetSdk 33
targetSdk 34
compileSdk 34

versionCode 1
versionName "1.0"

Expand All @@ -19,10 +19,14 @@ android {
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
debug {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

compileOptions {
Expand Down Expand Up @@ -51,13 +55,13 @@ android {
}

dependencies {
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.activity:activity-compose:1.8.1'
implementation 'com.google.android.material:material:1.10.0'

implementation "dev.romainguy:pathway:$pathway_version"

Expand Down
5 changes: 3 additions & 2 deletions v9/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ android {

defaultConfig {
minSdk 21
targetSdk 33
compileSdk 34
targetSdk 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -29,7 +30,7 @@ android {
}

dependencies {
androidTestImplementation 'androidx.core:core-ktx:1.10.0'
androidTestImplementation 'androidx.core:core-ktx:1.12.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down

0 comments on commit 00bf8ad

Please sign in to comment.