Skip to content

Commit

Permalink
build: dependency and syntax updates (ReVanced#17)
Browse files Browse the repository at this point in the history
* build: Update Gradle to v8.1.1

* build: Bump dependencies

* build: move repo configurations to settings

---------

Co-authored-by: Patryk Mis <24607131+PatrickMis@users.noreply.github.com>
  • Loading branch information
PatrykMis and PatrykMis authored Apr 23, 2023
1 parent e5d898f commit ec0f7e3
Show file tree
Hide file tree
Showing 7 changed files with 302 additions and 243 deletions.
49 changes: 18 additions & 31 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,13 @@ plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("kotlin-parcelize")
kotlin("plugin.serialization") version "1.7.20"
}

repositories {
mavenCentral()
maven("https://jitpack.io")
google()
maven {
url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
credentials {
username = (project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")) as String
password = (project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")) as String
}
}
kotlin("plugin.serialization") version "1.8.20"
}

android {
namespace = "app.revanced.manager.compose"
compileSdk = 33
buildToolsVersion = "33.0.0"
buildToolsVersion = "33.0.2"

defaultConfig {
applicationId = "app.revanced.manager.compose"
Expand Down Expand Up @@ -49,52 +36,52 @@ android {

buildFeatures.compose = true

composeOptions.kotlinCompilerExtensionVersion = "1.4.0"
composeOptions.kotlinCompilerExtensionVersion = "1.4.6"
}

dependencies {

// AndroidX Core
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0")
implementation("androidx.core:core-splashscreen:1.0.0")
implementation("androidx.activity:activity-compose:1.6.1")
implementation("androidx.core:core-ktx:1.10.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.activity:activity-compose:1.7.1")

// Compose
val composeVersion = "1.4.0-alpha05"
implementation("androidx.compose.ui:ui:$composeVersion")
implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
implementation(platform("androidx.compose:compose-bom:2023.04.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling-preview")

// Accompanist
val accompanistVersion = "0.29.1-alpha"
val accompanistVersion = "0.30.1"
implementation("com.google.accompanist:accompanist-systemuicontroller:$accompanistVersion")
//implementation("com.google.accompanist:accompanist-placeholder-material:$accompanistVersion")
implementation("com.google.accompanist:accompanist-drawablepainter:$accompanistVersion")
//implementation("com.google.accompanist:accompanist-flowlayout:$accompanistVersion")
//implementation("com.google.accompanist:accompanist-permissions:$accompanistVersion")

// KotlinX
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")

// Material 3
implementation("androidx.compose.material3:material3:1.1.0-alpha08")
implementation("androidx.compose.material3:material3")


// ReVanced
implementation("app.revanced:revanced-patcher:6.4.3")

// Koin
implementation("io.insert-koin:koin-android:3.3.2")
implementation("io.insert-koin:koin-androidx-compose:3.4.1")
implementation("io.insert-koin:koin-android:3.4.0")
implementation("io.insert-koin:koin-androidx-compose:3.4.4")

// Compose Navigation
implementation("dev.olshevski.navigation:reimagined:1.3.1")
implementation("dev.olshevski.navigation:reimagined:1.4.0")

// Ktor
val ktorVersion = "2.1.3"
val ktorVersion = "2.3.0"
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("io.ktor:ktor-client-logging:$ktorVersion")
implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
}
}
15 changes: 3 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
buildscript {
repositories {
google()
}
}

plugins {
id("com.android.application") version "7.3.1" apply false
id("com.android.library") version "7.3.1" apply false
id("org.jetbrains.kotlin.android") version "1.8.0" apply false
id("com.android.application") version "7.4.2" apply false
id("com.android.library") version "7.4.2" apply false
id("org.jetbrains.kotlin.android") version "1.8.20" apply false
}
repositories {
google()
}
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 @@
#Fri Jan 27 01:52:21 TRT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit ec0f7e3

Please sign in to comment.