Skip to content

Commit

Permalink
Updates to 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
simonsickle committed Apr 17, 2024
1 parent d33826a commit 9817e45
Show file tree
Hide file tree
Showing 15 changed files with 357 additions and 260 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'
distribution: 'zulu'
- name: Publish Artifacts
run: ./gradlew composed-barcodes:publishReleasePublicationToSonatypeRepository publishToSonatype closeAndReleaseSonatypeStagingRepository
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*.iml
.gradle
/local.properties
/secret.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
Expand Down
13 changes: 13 additions & 0 deletions .idea/deploymentTargetDropDown.xml

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

3 changes: 1 addition & 2 deletions .idea/gradle.xml

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

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

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

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

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

16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.4"
kotlinCompilerExtensionVersion = "1.5.12"
}

namespace "com.simonsickle.composedbarcodes"
Expand All @@ -46,14 +46,14 @@ dependencies {
implementation(project(":composed-barcodes"))

implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.10.0")
implementation("com.google.android.material:material:1.11.0")

implementation("androidx.compose.runtime:runtime:1.5.4")
implementation("androidx.compose.ui:ui:1.5.4")
implementation("androidx.compose.foundation:foundation-layout:1.5.4")
implementation("androidx.compose.material:material:1.5.4")
implementation("androidx.compose.ui:ui-tooling:1.5.4")
implementation("androidx.compose.runtime:runtime:1.6.6")
implementation("androidx.compose.ui:ui:1.6.6")
implementation("androidx.compose.foundation:foundation-layout:1.6.6")
implementation("androidx.compose.material:material:1.6.6")
implementation("androidx.compose.ui:ui-tooling:1.6.6")

// Nav components
implementation("androidx.navigation:navigation-compose:2.7.5")
implementation("androidx.navigation:navigation-compose:2.7.7")
}
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("com.android.application") version "8.1.1" apply false
id("com.android.library") version '8.1.1' apply false
id("org.jetbrains.kotlin.android") version "1.9.20" apply false
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
id("com.android.application") version "8.3.2" apply false
id("com.android.library") version '8.3.2' apply false
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
id("io.github.gradle-nexus.publish-plugin") version "1.0.0"
}

apply from: "${rootDir}/scripts/publish-root.gradle"
45 changes: 26 additions & 19 deletions composed-barcodes/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id "com.android.library"
id "kotlin-android"
}

ext {
PUBLISH_GROUP_ID = 'com.simonsickle'
PUBLISH_VERSION = '1.2.0'
PUBLISH_ARTIFACT_ID = 'composed-barcodes'
PUBLISH_GROUP_ID = "com.simonsickle"
PUBLISH_VERSION = "1.3.0"
PUBLISH_ARTIFACT_ID = "composed-barcodes"
}

apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"

android {
namespace "com.simonsickle.compose"

defaultConfig {
compileSdk 34
minSdkVersion 21
Expand All @@ -26,7 +26,7 @@ android {
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
}
}

Expand All @@ -44,33 +44,40 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.4"
kotlinCompilerExtensionVersion = "1.5.12"
}

packagingOptions {
jniLibs {
pickFirsts += ['**']
pickFirsts += ["**"]
}
resources {
pickFirsts += ['**']
pickFirsts += ["**"]
}
}

testOptions {
animationsDisabled true
}

namespace "com.simonsickle.compose"
publishing {
singleVariant("release") {
withJavadocJar()
withSourcesJar()
}
}
}

dependencies {
implementation("com.google.zxing:core:3.4.1")

implementation("androidx.compose.runtime:runtime:1.5.4")
implementation("androidx.compose.ui:ui:1.5.4")
implementation("androidx.compose.foundation:foundation:1.5.4")
implementation("androidx.compose.foundation:foundation-layout:1.5.4")
implementation("androidx.compose.material:material:1.5.4")
implementation 'androidx.compose.ui:ui-tooling-preview:1.5.4'
debugImplementation 'androidx.compose.ui:ui-tooling:1.5.4'
implementation("androidx.compose.runtime:runtime:1.6.6")
implementation("androidx.compose.ui:ui:1.6.6")
implementation("androidx.compose.foundation:foundation:1.6.6")
implementation("androidx.compose.foundation:foundation-layout:1.6.6")
implementation("androidx.compose.material:material:1.6.6")
implementation "androidx.compose.ui:ui-tooling-preview:1.6.6"
debugImplementation "androidx.compose.ui:ui-tooling:1.6.6"
}

apply from: "${rootDir}/scripts/publish-module.gradle"
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 @@
#Thu Sep 24 20:43:24 EDT 2020
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 9817e45

Please sign in to comment.