Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1

- name: Configure JDK
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
cache: gradle

- name: Test
run: ./gradlew assemble
run: ./gradlew assemble
18 changes: 8 additions & 10 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
push:
tags:
- '*'

env:
RELEASE_SIGNING_ENABLED: true

jobs:
publish:

runs-on: ubuntu-latest
if: github.repository == 'Jawnnypoo/PhysicsLayout'

Expand All @@ -20,16 +20,14 @@ jobs:
- name: Install JDK
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17

- name: Set version
run: sed -i "s/VERSION_NAME=0.0.1/VERSION_NAME=$GITHUB_REF_NAME/" gradle.properties
distribution: zulu
java-version: '17'
cache: gradle

- name: Release to Maven Central
run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
run: ./gradlew publishAndReleaseToMavenCentral -PVERSION_NAME="${GITHUB_REF_NAME}" --no-configuration-cache
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
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 }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ See it in action with the sample app:
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.jawnnypoo/physicslayout/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.jawnnypoo/physicslayout)

## Gradle
```groovy
```kotlin
dependencies {
implementation("com.jawnnypoo:physicslayout:latest.release.here")
}
Expand Down Expand Up @@ -96,7 +96,7 @@ This library was designed with the intention of allowing for playful animations
License
--------

Copyright 2024 John Carlson
Copyright 2025 John Carlson
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol


Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
20 changes: 11 additions & 9 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
plugins {
id("com.android.application")
id("kotlin-android")
alias(libs.plugins.android.application)
}

android {
namespace = "com.jawnnypoo.physicslayout.sample"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.jawnnypoo.physicslayout.sample"
minSdk = 21
targetSdk = 34
versionCode = 101
versionName = "1.0.1"
targetSdk = 35
versionCode = 102
versionName = "1.0.2"
}

buildFeatures {
Expand All @@ -23,15 +22,19 @@ android {
getByName("release") {
isMinifyEnabled = true
isShrinkResources = true
proguardFiles("proguard-rules.pro", getDefaultProguardFile("proguard-android.txt"))
proguardFiles("proguard-rules.pro", getDefaultProguardFile("proguard-android-optimize.txt"))
}
getByName("debug") {
isMinifyEnabled = false
isShrinkResources = false
proguardFiles("proguard-rules.pro", getDefaultProguardFile("proguard-android.txt"))
proguardFiles("proguard-rules.pro", getDefaultProguardFile("proguard-android-optimize.txt"))
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}

kotlin {
Expand Down Expand Up @@ -62,7 +65,6 @@ dependencies {
exclude(group = "com.intellij", module = "annotations")
}


implementation(libs.gimbal)

implementation(project(":physicslayout"))
Expand Down
7 changes: 3 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
alias(libs.plugins.com.android.application) apply false
alias(libs.plugins.com.android.library) apply false
alias(libs.plugins.org.jetbrains.kotlin.android) apply false
alias(libs.plugins.com.vanniktech.publish) apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.vanniktech.publish) apply false
}
25 changes: 4 additions & 21 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.

# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# 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
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true

GROUP=com.jawnnypoo
POM_ARTIFACT_ID=physicslayout
POM_PACKAGING=aar
VERSION_NAME=3.0.3

POM_NAME=PhysicsLayout
POM_DESCRIPTION=Android layout that simulates physics using JBox2D. Simply add views, enable physics, and watch them fall!
Expand All @@ -39,5 +22,5 @@ POM_DEVELOPER_ID=Jawnnypoo
POM_DEVELOPER_NAME=John Carlson
POM_DEVELOPER_URL=https://github.com/Jawnnypoo/

# This gets updated by CI
VERSION_NAME=0.0.1
SONATYPE_CONNECT_TIMEOUT_SECONDS=60
SONATYPE_CLOSE_TIMEOUT_SECONDS=900
34 changes: 15 additions & 19 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
[versions]
org-jetbrains-kotlin-android = "1.9.10"
agp = "8.2.1"
coroutines = "1.7.3"
retrofit = "2.9.0"
agp = "9.1.0"
coroutines = "1.10.2"

[libraries]
jbox2d = { group = "org.jbox2d", name = "jbox2d-library", version = "2.2.1.1" }
translation-drag-view-helper = { group = "com.commit451", name = "translationviewdraghelper", version = "2.0.3" }

coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }

androidx-activity = { group = "androidx.activity", name = "activity-ktx", version = "1.8.2" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" }
androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.7.0" }
androidx-activity = { group = "androidx.activity", name = "activity-ktx", version = "1.10.1" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.9.0" }

google-material = { group = "com.google.android.material", name = "material", version = "1.11.0" }
google-material = { group = "com.google.android.material", name = "material", version = "1.12.0" }

circle-image-view = { group = "de.hdodenhof", name = "circleimageview", version = "3.1.0" }

coil = { group = "io.coil-kt", name = "coil", version = "2.5.0" }
coil = { group = "io.coil-kt", name = "coil", version = "2.7.0" }

retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
retrofit-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "retrofit" }
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version = "2.11.0" }
retrofit-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version = "2.11.0" }

moshi = { group = "com.squareup.moshi", name = "moshi-kotlin", version = "1.13.0" }
moshi = { group = "com.squareup.moshi", name = "moshi-kotlin", version = "1.15.2" }

flowlayout = { group = "com.wefika", name = "flowlayout", version = "0.4.1" }

gimbal = { group = "com.github.Commit451", name = "Gimbal", version = "3.0.0" }

gimbal = { group = "com.commit451", name = "gimbal", version = "3.1.0" }

[plugins]
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" }
com-android-application = { id = "com.android.application", version.ref = "agp" }
com-android-library = { id = "com.android.library", version.ref = "agp" }
com-vanniktech-publish = { id = "com.vanniktech.maven.publish", version = "0.27.0" }
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
vanniktech-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-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
zipStorePath=wrapper/dists
Loading