Skip to content

Commit 504545e

Browse files
Revert "upgrade to AGP 8.3.2, Gradle 8.8, Android SDK 35 (#2923)"
This reverts commit 20c1580.
1 parent 8d2ee00 commit 504545e

6 files changed

Lines changed: 72 additions & 38 deletions

File tree

CHANGELOG.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
## [6.1.0]
44

5-
### Chores
6-
7-
* Android build now targets SDK 35 [#2736](https://github.com/TryQuiet/quiet/issues/2736)
8-
95
### Fixes
106

117
* Abrupt closes properly clean up resources and save data [#2921](https://github.com/TryQuiet/quiet/issues/2921)

packages/mobile/android/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '2.0.21'
4+
ext.kotlin_version = '1.8.0'
55
ext {
6-
buildToolsVersion = "35.0.0"
6+
buildToolsVersion = "34.0.0"
77

88
minSdkVersion = 26
99

10-
compileSdkVersion = 35
11-
targetSdkVersion = 35
12-
10+
compileSdkVersion = 34
11+
targetSdkVersion = 34
12+
1313
if (System.properties['os.arch'] == "aarch64") {
1414
// For M1 Users we need to use the NDK 24 which added support for aarch64
1515
ndkVersion = "25.1.8937393"
@@ -23,12 +23,12 @@ buildscript {
2323
mavenCentral()
2424
}
2525
dependencies {
26-
classpath("com.android.tools.build:gradle:8.3.2")
26+
classpath("com.android.tools.build:gradle:7.2.2")
2727

2828
classpath("com.facebook.react:react-native-gradle-plugin")
2929

3030
classpath("de.undercouch:gradle-download-task:5.0.1")
31-
31+
3232
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3333
// NOTE: Do not place your application dependencies here; they belong
3434
// in the individual module build.gradle files
@@ -51,7 +51,7 @@ allprojects {
5151
maven { url 'https://www.jitpack.io' }
5252

5353
maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
54-
54+
5555
maven { url "https://mvnrepository.com/artifact/commons-io/commons-io" }
5656

5757
maven { url "$rootDir/../node_modules/detox/Detox-android" }

packages/mobile/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
66
networkTimeout=10000

packages/mobile/android/gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/mobile/package-lock.json

Lines changed: 61 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/mobile/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"@localfirst/auth": "file:../../3rd-party/auth/packages/auth/dist",
100100
"@quiet/eslint-config": "^2.0.2-alpha.0",
101101
"@react-native-async-storage/async-storage": "^1.21.0",
102-
"@react-native-community/cli-platform-android": "^12.3.6",
102+
"@react-native-community/cli-platform-android": "^12.3.4",
103103
"@react-native-community/eslint-config": "^2.0.0",
104104
"@react-native-community/push-notification-ios": "^1.10.1",
105105
"@react-native/gradle-plugin": "0.73.2",

0 commit comments

Comments
 (0)