Skip to content

Commit

Permalink
support agp 8 (#2)
Browse files Browse the repository at this point in the history
Co-authored-by: Askhar Aydarov <[email protected]>
  • Loading branch information
0xera and Askhar Aydarov authored Aug 24, 2024
1 parent bae9fe0 commit 5210bb9
Show file tree
Hide file tree
Showing 33 changed files with 1,122 additions and 562 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- name: Perform base checks
run: ./gradlew build publishToDirectory
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea/
.DS_Store
/build
/captures
Expand Down
18 changes: 2 additions & 16 deletions .idea/codeStyles/Project.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/compiler.xml

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

14 changes: 12 additions & 2 deletions .idea/gradle.xml

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

7 changes: 6 additions & 1 deletion .idea/jarRepositories.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/misc.xml

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

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

35 changes: 4 additions & 31 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,31 +1,4 @@
buildscript {
repositories {
maven("build/maven")
maven("https://dl.bintray.com/deepmedia/tools/")
google()
jcenter()
}

configurations.configureEach {
resolutionStrategy.cacheChangingModulesFor(10, TimeUnit.SECONDS)
}

dependencies {
classpath("io.deepmedia.tools:publisher:0.4.0")
classpath("io.deepmedia.tools:grease:0.2.0") {
isChanging = true
}
}
}

allprojects {
repositories {
mavenCentral()
google()
jcenter()
}
}

tasks.register("clean", Delete::class) {
delete(buildDir)
}
plugins {
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.jvm) apply false
}
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
23 changes: 23 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[versions]
agp = "8.1.4"
asm-commons = "9.6"
android-tools = "31.1.4"
kotlin = "2.0.0"
shadow = "8.3.0"
publisher = "0.14.0"

[libraries]
asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm-commons" }
gradle-android-common = { module = "com.android.tools:common", version.ref = "android-tools" }
gradle-android-sdk-common = { module = "com.android.tools:sdk-common", version.ref = "android-tools" }
gradle-android-layoutlib = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "android-tools" }
gradle-android-build = { module = "com.android.tools.build:gradle", version.ref = "agp" }
gradle-shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow" }

[bundles]
gradle-android = ["gradle-android-sdk-common", "gradle-android-build", "gradle-android-common", "gradle-android-layoutlib"]

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
publisher = { id = "io.deepmedia.tools.deployer", version.ref = "publisher" }
android-library = { id = "com.android.library", version.ref = "agp" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Wed Mar 18 11:56:36 BRT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
Loading

0 comments on commit 5210bb9

Please sign in to comment.