diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..ea7e0e9 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +name: Build + +on: + push: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: '17' + cache: gradle + + - name: Validate Gradle Wrapper + uses: gradle/actions/wrapper-validation@v4 + + - name: Build + run: ./gradlew build diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml new file mode 100644 index 0000000..6f48d74 --- /dev/null +++ b/.github/workflows/publish-release.yml @@ -0,0 +1,33 @@ +name: Publish Release + +on: + push: + tags: + - '*' + +env: + RELEASE_SIGNING_ENABLED: true + +jobs: + publish: + runs-on: ubuntu-latest + if: github.repository == 'Commit451/Addendum' + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install JDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: '17' + cache: gradle + + - name: Release to Maven Central + run: ./gradlew publishAndReleaseToMavenCentral -PVERSION_NAME="${GITHUB_REF_NAME}" --no-configuration-cache + env: + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cac6772..0000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: android - -jdk: - - oraclejdk8 - -before_install: - - mkdir "$ANDROID_HOME/licenses" || true - - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license" - -script: "./gradlew build" diff --git a/README.md b/README.md index ec93007..771da32 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,21 @@ # Addendum Useful Kotlin Extensions for the Android SDK and popular Android Libraries -[![Build Status](https://travis-ci.org/Commit451/Addendum.svg?branch=master)](https://travis-ci.org/Commit451/Addendum) [![](https://jitpack.io/v/Commit451/Addendum.svg)](https://jitpack.io/#Commit451/Addendum) +[![Build](https://github.com/Commit451/Addendum/actions/workflows/ci.yml/badge.svg)](https://github.com/Commit451/Addendum/actions/workflows/ci.yml) [![Maven Central](https://img.shields.io/maven-central/v/com.commit451/addendum.svg?label=Maven%20Central)](https://central.sonatype.com/search?q=g:com.commit451%20AND%20a:addendum) ## Gradle Dependency -Add the jitpack url to the project: -```groovy -allprojects { - repositories { - ... - maven { url "https://jitpack.io" } - } -} -``` -then, in your app `build.gradle` +In your app `build.gradle`: ```groovy dependencies { - implementation "com.github.Commit451.Addendum:addendum:latest.version.here" + implementation "com.commit451:addendum:latest.version.here" //for design support library - implementation "com.github.Commit451.Addendum:addendum-design:latest.version.here" + implementation "com.commit451:addendum-design:latest.version.here" //for RecyclerView support - implementation "com.github.Commit451.Addendum:addendum-recyclerview:latest.version.here" + implementation "com.commit451:addendum-recyclerview:latest.version.here" //for Parceler support - implementation "com.github.Commit451.Addendum:addendum-parceler:latest.version.here" + implementation "com.commit451:addendum-parceler:latest.version.here" //for ThreeTenABP support - implementation "com.github.Commit451.Addendum:addendum-threetenabp:latest.version.here" + implementation "com.commit451:addendum-threetenabp:latest.version.here" } ``` diff --git a/addendum-design/build.gradle b/addendum-design/build.gradle deleted file mode 100644 index 71cb960..0000000 --- a/addendum-design/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } -} - -dependencies { - api "com.google.android.material:material:1.0.0" - implementation project(':addendum') -} - -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' diff --git a/addendum-design/build.gradle.kts b/addendum-design/build.gradle.kts new file mode 100644 index 0000000..a717c2a --- /dev/null +++ b/addendum-design/build.gradle.kts @@ -0,0 +1,38 @@ +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + id("com.android.library") + id("com.vanniktech.maven.publish") +} + +group = findProperty("GROUP") as String +version = findProperty("VERSION_NAME") as String + +android { + namespace = "com.commit451.addendum.design" + compileSdk = rootProject.extra["compileSdkVersion"] as Int + + defaultConfig { + minSdk = rootProject.extra["minSdkVersion"] as Int + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + +dependencies { + api("com.google.android.material:material:1.13.0") + implementation(project(":addendum")) +} + +mavenPublishing { + configure(AndroidSingleVariantLibrary("release", true, true)) + coordinates("com.commit451", "addendum-design", version.toString()) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + if (System.getenv("RELEASE_SIGNING_ENABLED") == "true") { + signAllPublications() + } +} diff --git a/addendum-design/src/main/AndroidManifest.xml b/addendum-design/src/main/AndroidManifest.xml index bf0a331..cc947c5 100644 --- a/addendum-design/src/main/AndroidManifest.xml +++ b/addendum-design/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/addendum-design/src/main/java/com/commit451/addendum/design/Snackbar.kt b/addendum-design/src/main/java/com/commit451/addendum/design/Snackbar.kt index 38948ae..48d2f54 100644 --- a/addendum-design/src/main/java/com/commit451/addendum/design/Snackbar.kt +++ b/addendum-design/src/main/java/com/commit451/addendum/design/Snackbar.kt @@ -3,6 +3,7 @@ package com.commit451.addendum.design import android.widget.TextView +import com.google.android.material.R import com.google.android.material.snackbar.Snackbar diff --git a/addendum-parceler/build.gradle b/addendum-parceler/build.gradle deleted file mode 100644 index 4ec3cb7..0000000 --- a/addendum-parceler/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } -} - -dependencies { - api 'org.parceler:parceler-api:1.1.12' - implementation project(':addendum') -} - -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' diff --git a/addendum-parceler/build.gradle.kts b/addendum-parceler/build.gradle.kts new file mode 100644 index 0000000..6d6355a --- /dev/null +++ b/addendum-parceler/build.gradle.kts @@ -0,0 +1,38 @@ +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + id("com.android.library") + id("com.vanniktech.maven.publish") +} + +group = findProperty("GROUP") as String +version = findProperty("VERSION_NAME") as String + +android { + namespace = "com.commit451.addendum.parceler" + compileSdk = rootProject.extra["compileSdkVersion"] as Int + + defaultConfig { + minSdk = rootProject.extra["minSdkVersion"] as Int + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + +dependencies { + api("org.parceler:parceler-api:1.1.13") + implementation(project(":addendum")) +} + +mavenPublishing { + configure(AndroidSingleVariantLibrary("release", true, true)) + coordinates("com.commit451", "addendum-parceler", version.toString()) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + if (System.getenv("RELEASE_SIGNING_ENABLED") == "true") { + signAllPublications() + } +} diff --git a/addendum-parceler/src/main/AndroidManifest.xml b/addendum-parceler/src/main/AndroidManifest.xml index 27f4a4a..cc947c5 100644 --- a/addendum-parceler/src/main/AndroidManifest.xml +++ b/addendum-parceler/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/addendum-recyclerview/build.gradle b/addendum-recyclerview/build.gradle deleted file mode 100644 index 5275642..0000000 --- a/addendum-recyclerview/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } -} - -dependencies { - api "androidx.recyclerview:recyclerview:1.0.0" - implementation project(':addendum') -} - -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' diff --git a/addendum-recyclerview/build.gradle.kts b/addendum-recyclerview/build.gradle.kts new file mode 100644 index 0000000..bd250d5 --- /dev/null +++ b/addendum-recyclerview/build.gradle.kts @@ -0,0 +1,38 @@ +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + id("com.android.library") + id("com.vanniktech.maven.publish") +} + +group = findProperty("GROUP") as String +version = findProperty("VERSION_NAME") as String + +android { + namespace = "com.commit451.addendum.recyclerview" + compileSdk = rootProject.extra["compileSdkVersion"] as Int + + defaultConfig { + minSdk = rootProject.extra["minSdkVersion"] as Int + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + +dependencies { + api("androidx.recyclerview:recyclerview:1.4.0") + implementation(project(":addendum")) +} + +mavenPublishing { + configure(AndroidSingleVariantLibrary("release", true, true)) + coordinates("com.commit451", "addendum-recyclerview", version.toString()) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + if (System.getenv("RELEASE_SIGNING_ENABLED") == "true") { + signAllPublications() + } +} diff --git a/addendum-recyclerview/src/main/AndroidManifest.xml b/addendum-recyclerview/src/main/AndroidManifest.xml index 32ab318..cc947c5 100644 --- a/addendum-recyclerview/src/main/AndroidManifest.xml +++ b/addendum-recyclerview/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/addendum-threetenabp/build.gradle b/addendum-threetenabp/build.gradle deleted file mode 100644 index 87cf85c..0000000 --- a/addendum-threetenabp/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } -} - -dependencies { - api "com.jakewharton.threetenabp:threetenabp:1.2.1" - implementation project(':addendum') -} - -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' diff --git a/addendum-threetenabp/build.gradle.kts b/addendum-threetenabp/build.gradle.kts new file mode 100644 index 0000000..7ebc4f2 --- /dev/null +++ b/addendum-threetenabp/build.gradle.kts @@ -0,0 +1,38 @@ +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + id("com.android.library") + id("com.vanniktech.maven.publish") +} + +group = findProperty("GROUP") as String +version = findProperty("VERSION_NAME") as String + +android { + namespace = "com.commit451.addendum.threetenabp" + compileSdk = rootProject.extra["compileSdkVersion"] as Int + + defaultConfig { + minSdk = rootProject.extra["minSdkVersion"] as Int + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + +dependencies { + api("com.jakewharton.threetenabp:threetenabp:1.4.8") + implementation(project(":addendum")) +} + +mavenPublishing { + configure(AndroidSingleVariantLibrary("release", true, true)) + coordinates("com.commit451", "addendum-threetenabp", version.toString()) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + if (System.getenv("RELEASE_SIGNING_ENABLED") == "true") { + signAllPublications() + } +} diff --git a/addendum-threetenabp/src/main/AndroidManifest.xml b/addendum-threetenabp/src/main/AndroidManifest.xml index 107d03e..cc947c5 100644 --- a/addendum-threetenabp/src/main/AndroidManifest.xml +++ b/addendum-threetenabp/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/addendum/build.gradle b/addendum/build.gradle deleted file mode 100644 index 0399417..0000000 --- a/addendum/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } -} - -dependencies { - api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - - api "androidx.appcompat:appcompat:1.0.2" - - testImplementation "junit:junit:4.12" -} - -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' diff --git a/addendum/build.gradle.kts b/addendum/build.gradle.kts new file mode 100644 index 0000000..7744066 --- /dev/null +++ b/addendum/build.gradle.kts @@ -0,0 +1,39 @@ +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + id("com.android.library") + id("com.vanniktech.maven.publish") +} + +group = findProperty("GROUP") as String +version = findProperty("VERSION_NAME") as String + +android { + namespace = "com.commit451.addendum" + compileSdk = rootProject.extra["compileSdkVersion"] as Int + + defaultConfig { + minSdk = rootProject.extra["minSdkVersion"] as Int + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + +dependencies { + api("androidx.appcompat:appcompat:1.7.1") + + testImplementation("junit:junit:4.13.2") +} + +mavenPublishing { + configure(AndroidSingleVariantLibrary("release", true, true)) + coordinates("com.commit451", "addendum", version.toString()) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + if (System.getenv("RELEASE_SIGNING_ENABLED") == "true") { + signAllPublications() + } +} diff --git a/addendum/src/main/AndroidManifest.xml b/addendum/src/main/AndroidManifest.xml index 31fe14f..cc947c5 100644 --- a/addendum/src/main/AndroidManifest.xml +++ b/addendum/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/addendum/src/main/java/com/commit451/addendum/Activity.kt b/addendum/src/main/java/com/commit451/addendum/Activity.kt index 1288ef0..563c0e4 100644 --- a/addendum/src/main/java/com/commit451/addendum/Activity.kt +++ b/addendum/src/main/java/com/commit451/addendum/Activity.kt @@ -46,14 +46,14 @@ inline fun Activity.bindView(@IdRes id: Int): Lazy { inline fun Activity.extra(key: String): Lazy { return lazy(LazyThreadSafetyMode.NONE) { @Suppress("UNCHECKED_CAST") - intent.extras.get(key) as T + intent.extras?.get(key) as T } } inline fun Activity.extraOrNull(key: String): Lazy { return lazy(LazyThreadSafetyMode.NONE) { @Suppress("UNCHECKED_CAST") - intent.extras.get(key) as? T? + intent.extras?.get(key) as? T? } } diff --git a/addendum/src/main/java/com/commit451/addendum/Context.kt b/addendum/src/main/java/com/commit451/addendum/Context.kt index abcda58..03a0413 100644 --- a/addendum/src/main/java/com/commit451/addendum/Context.kt +++ b/addendum/src/main/java/com/commit451/addendum/Context.kt @@ -27,7 +27,7 @@ inline fun Context.color(@ColorRes color: Int): Int { inline fun Context.copyToClipboard(label: String, text: String) { val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clip = ClipData.newPlainText(label, text) - clipboard.primaryClip = clip + clipboard.setPrimaryClip(clip) } /** diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 35fc7c9..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,39 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - applicationId "com.commit451.addendum.sample" - minSdkVersion 21 - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - - implementation 'androidx.core:core-ktx:1.0.1' - - implementation "androidx.appcompat:appcompat:1.0.2" - - implementation 'com.jakewharton.timber:timber:4.7.1' - - implementation project(':addendum') - implementation project(':addendum-design') - implementation project(':addendum-parceler') - implementation project(':addendum-recyclerview') - implementation project(':addendum-threetenabp') - - kapt 'org.parceler:parceler:1.1.12' -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..8b45b45 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + id("com.android.application") +} + +android { + namespace = "com.commit451.addendum.sample" + compileSdk = rootProject.extra["compileSdkVersion"] as Int + + defaultConfig { + applicationId = "com.commit451.addendum.sample" + minSdk = 21 + targetSdk = rootProject.extra["targetSdkVersion"] as Int + versionCode = 1 + versionName = "1.0" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + +dependencies { + implementation("androidx.core:core-ktx:1.16.0") + implementation("androidx.appcompat:appcompat:1.7.1") + implementation("com.jakewharton.timber:timber:5.0.1") + + implementation(project(":addendum")) + implementation(project(":addendum-design")) + implementation(project(":addendum-parceler")) + implementation(project(":addendum-recyclerview")) + implementation(project(":addendum-threetenabp")) +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0b68e8f..013087e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + - + - + - \ No newline at end of file + diff --git a/build.gradle b/build.gradle deleted file mode 100644 index e73ff04..0000000 --- a/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -buildscript { - ext.kotlin_version = '1.3.31' - repositories { - google() - jcenter() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - } -} - -plugins { - id 'com.github.ben-manes.versions' version '0.21.0' -} - -allprojects { - repositories { - google() - jcenter() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} - -ext { - minSdkVersion = 16 - compileSdkVersion = 28 - targetSdkVersion = compileSdkVersion -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..2ad6ae6 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + id("com.android.application") version "9.1.0" apply false + id("com.android.library") version "9.1.0" apply false + id("org.jetbrains.kotlin.android") version "2.3.10" apply false + id("org.jetbrains.kotlin.kapt") version "2.3.10" apply false + id("com.vanniktech.maven.publish") version "0.30.0" apply false +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} + +extra["minSdkVersion"] = 21 +extra["compileSdkVersion"] = 35 +extra["targetSdkVersion"] = 35 diff --git a/gradle.properties b/gradle.properties index aac7c9b..4ad338f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,25 @@ -# Project-wide Gradle settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. +GROUP=com.commit451 +VERSION_NAME=1.0.1 -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html +POM_NAME=Addendum +POM_DESCRIPTION=Useful Kotlin Extensions for the Android SDK and popular Android Libraries +POM_INCEPTION_YEAR=2018 +POM_URL=https://github.com/Commit451/Addendum/ -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m +POM_LICENSE_NAME=The Apache Software License, Version 2.0 +POM_LICENSE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENSE_DIST=repo -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +POM_SCM_URL=https://github.com/Commit451/Addendum/ +POM_SCM_CONNECTION=scm:git:git://github.com/Commit451/Addendum/.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/Commit451/Addendum/.git + +POM_DEVELOPER_ID=Commit451 +POM_DEVELOPER_NAME=Commit 451 +POM_DEVELOPER_URL=https://github.com/Commit451/ + +SONATYPE_CONNECT_TIMEOUT_SECONDS=60 +SONATYPE_CLOSE_TIMEOUT_SECONDS=900 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738c..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee69dd6..5f38436 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,128 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 0f8d593..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,48 +57,35 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 180475a..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app', ':addendum', ':addendum-design', ':addendum-recyclerview', ':addendum-parceler', ':addendum-threetenabp' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..51f8c43 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "Addendum" +include(":app", ":addendum", ":addendum-design", ":addendum-recyclerview", ":addendum-parceler", ":addendum-threetenabp")