Skip to content

Commit dc91b80

Browse files
theJawnnybottheJawnnybot
committed
build: migrate with open-source-library-migration guide
1 parent 827db24 commit dc91b80

15 files changed

Lines changed: 318 additions & 265 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Build
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
pull_request:
46

57
jobs:
68
build:
@@ -10,14 +12,15 @@ jobs:
1012
- name: Checkout
1113
uses: actions/checkout@v4
1214

13-
- name: Validate Gradle Wrapper
14-
uses: gradle/wrapper-validation-action@v1
15-
1615
- name: Configure JDK
1716
uses: actions/setup-java@v4
1817
with:
19-
distribution: 'zulu'
18+
distribution: zulu
2019
java-version: '17'
20+
cache: gradle
21+
22+
- name: Validate Gradle Wrapper
23+
uses: gradle/actions/wrapper-validation@v4
2124

22-
- name: Test
23-
run: ./gradlew assemble
25+
- name: Build
26+
run: ./gradlew build

‎.github/workflows/publish-release.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
push:
55
tags:
66
- '*'
7+
78
env:
89
RELEASE_SIGNING_ENABLED: true
910

1011
jobs:
1112
publish:
12-
1313
runs-on: ubuntu-latest
1414
if: github.repository == 'Jawnnypoo/PhysicsLayout'
1515

@@ -20,16 +20,14 @@ jobs:
2020
- name: Install JDK
2121
uses: actions/setup-java@v4
2222
with:
23-
distribution: 'zulu'
24-
java-version: 17
25-
26-
- name: Set version
27-
run: sed -i "s/VERSION_NAME=0.0.1/VERSION_NAME=$GITHUB_REF_NAME/" gradle.properties
23+
distribution: zulu
24+
java-version: '17'
25+
cache: gradle
2826

2927
- name: Release to Maven Central
30-
run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
28+
run: ./gradlew publishAndReleaseToMavenCentral -PVERSION_NAME="${GITHUB_REF_NAME}" --no-configuration-cache
3129
env:
32-
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
33-
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
30+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
31+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
3432
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
35-
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
33+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Android layout that simulates physics using [JBox2D](https://github.com/jbox2d/j
33

44
See it in action with the sample app:
55

6-
[![Google Play](https://raw.githubusercontent.com/Jawnnypoo/PhysicsLayout/master/art/google-play-badge.png)](https://play.google.com/store/apps/details?id=com.jawnnypoo.physicslayout.sample)
6+
[![Google Play](https://raw.githubusercontent.com/Jawnnypoo/PhysicsLayout/main/art/google-play-badge.png)](https://play.google.com/store/apps/details?id=com.jawnnypoo.physicslayout.sample)
77

8-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.jawnnypoo/physicslayout/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.jawnnypoo/physicslayout)
8+
[![Build](https://github.com/Jawnnypoo/PhysicsLayout/actions/workflows/ci.yml/badge.svg)](https://github.com/Jawnnypoo/PhysicsLayout/actions/workflows/ci.yml) [![Maven Central](https://img.shields.io/maven-central/v/com.jawnnypoo/physicslayout.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.jawnnypoo/physicslayout)
99

1010
## Gradle
1111
```groovy

‎app/build.gradle.kts‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
plugins {
22
id("com.android.application")
3-
id("kotlin-android")
43
}
54

65
android {
76
namespace = "com.jawnnypoo.physicslayout.sample"
8-
compileSdk = 34
7+
compileSdk = 35
98

109
defaultConfig {
1110
applicationId = "com.jawnnypoo.physicslayout.sample"
1211
minSdk = 21
13-
targetSdk = 34
12+
targetSdk = 35
1413
versionCode = 101
1514
versionName = "1.0.1"
1615
}
@@ -19,24 +18,26 @@ android {
1918
viewBinding = true
2019
}
2120

21+
compileOptions {
22+
sourceCompatibility = JavaVersion.VERSION_17
23+
targetCompatibility = JavaVersion.VERSION_17
24+
}
25+
2226
buildTypes {
2327
getByName("release") {
2428
isMinifyEnabled = true
2529
isShrinkResources = true
26-
proguardFiles("proguard-rules.pro", getDefaultProguardFile("proguard-android.txt"))
30+
proguardFiles("proguard-rules.pro", getDefaultProguardFile("proguard-android-optimize.txt"))
2731
}
2832
getByName("debug") {
2933
isMinifyEnabled = false
3034
isShrinkResources = false
31-
proguardFiles("proguard-rules.pro", getDefaultProguardFile("proguard-android.txt"))
35+
proguardFiles("proguard-rules.pro", getDefaultProguardFile("proguard-android-optimize.txt"))
3236
}
3337
}
3438

3539
}
3640

37-
kotlin {
38-
jvmToolchain(17)
39-
}
4041

4142
dependencies {
4243
implementation(libs.coroutines.core)
@@ -63,7 +64,5 @@ dependencies {
6364
}
6465

6566

66-
implementation(libs.gimbal)
67-
6867
implementation(project(":physicslayout"))
6968
}

‎app/src/main/java/com/jawnnypoo/physicslayout/sample/AboutActivity.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import androidx.activity.viewModels
1616
import androidx.appcompat.app.AppCompatActivity
1717
import androidx.appcompat.graphics.drawable.DrawerArrowDrawable
1818
import coil.load
19-
import com.commit451.gimbal.Gimbal
2019
import com.jawnnypoo.physicslayout.Physics
2120
import com.jawnnypoo.physicslayout.PhysicsConfig
2221
import com.jawnnypoo.physicslayout.Shape
@@ -37,12 +36,10 @@ class AboutActivity : AppCompatActivity() {
3736
private lateinit var binding: ActivityAboutBinding
3837
private lateinit var sensorManager: SensorManager
3938
private var gravitySensor: Sensor? = null
40-
private lateinit var gimbal: Gimbal
4139

4240
private val sensorEventListener = object : SensorEventListener {
4341
override fun onSensorChanged(event: SensorEvent) {
4442
if (event.sensor.type == Sensor.TYPE_GRAVITY) {
45-
gimbal.normalizeGravityEvent(event)
4643
binding.physicsLayout.physics.setGravity(-event.values[0], event.values[1])
4744
}
4845
}
@@ -52,8 +49,6 @@ class AboutActivity : AppCompatActivity() {
5249

5350
override fun onCreate(savedInstanceState: Bundle?) {
5451
super.onCreate(savedInstanceState)
55-
gimbal = Gimbal(this)
56-
gimbal.lock()
5752
binding = ActivityAboutBinding.inflate(layoutInflater)
5853
setContentView(binding.root)
5954
findViewById<View>(R.id.sauce).setOnClickListener { openPage("https://github.com/Jawnnypoo/PhysicsLayout") }

‎build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.com.android.application) apply false
33
alias(libs.plugins.com.android.library) apply false
4-
alias(libs.plugins.org.jetbrains.kotlin.android) apply false
54
alias(libs.plugins.com.vanniktech.publish) apply false
65
}

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919
android.useAndroidX=true
20+
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
2021

2122
GROUP=com.jawnnypoo
2223
POM_ARTIFACT_ID=physicslayout
@@ -39,5 +40,4 @@ POM_DEVELOPER_ID=Jawnnypoo
3940
POM_DEVELOPER_NAME=John Carlson
4041
POM_DEVELOPER_URL=https://github.com/Jawnnypoo/
4142

42-
# This gets updated by CI
43-
VERSION_NAME=0.0.1
43+
VERSION_NAME=3.0.3

‎gradle/libs.versions.toml‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,33 @@
11
[versions]
2-
org-jetbrains-kotlin-android = "1.9.10"
3-
agp = "8.2.1"
4-
coroutines = "1.7.3"
5-
retrofit = "2.9.0"
2+
agp = "9.1.0"
3+
coroutines = "1.10.2"
4+
retrofit = "2.11.0"
65

76
[libraries]
87
jbox2d = { group = "org.jbox2d", name = "jbox2d-library", version = "2.2.1.1" }
9-
translation-drag-view-helper = { group = "com.commit451", name = "translationviewdraghelper", version = "2.0.3" }
8+
translation-drag-view-helper = { group = "com.commit451", name = "translationviewdraghelper", version = "2.0.4" }
109

1110
coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
12-
coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
11+
coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
1312

14-
androidx-activity = { group = "androidx.activity", name = "activity-ktx", version = "1.8.2" }
15-
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" }
16-
androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.7.0" }
13+
androidx-activity = { group = "androidx.activity", name = "activity-ktx", version = "1.10.1" }
14+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.1" }
15+
androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.9.1" }
1716

18-
google-material = { group = "com.google.android.material", name = "material", version = "1.11.0" }
17+
google-material = { group = "com.google.android.material", name = "material", version = "1.13.0" }
1918

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

22-
coil = { group = "io.coil-kt", name = "coil", version = "2.5.0" }
21+
coil = { group = "io.coil-kt", name = "coil", version = "2.7.0" }
2322

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

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

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

31-
gimbal = { group = "com.github.Commit451", name = "Gimbal", version = "3.0.0" }
32-
33-
3430
[plugins]
35-
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" }
3631
com-android-application = { id = "com.android.application", version.ref = "agp" }
3732
com-android-library = { id = "com.android.library", version.ref = "agp" }
38-
com-vanniktech-publish = { id = "com.vanniktech.maven.publish", version = "0.27.0" }
33+
com-vanniktech-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }

‎gradle/wrapper/gradle-wrapper.jar‎

-12.7 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7-
zipStorePath=wrapper/dists
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)