Skip to content

Commit dea6db3

Browse files
abnegateabnegate
committed
Platform and dependency updates
1 parent d6d6196 commit dea6db3

File tree

8 files changed

+28
-31
lines changed

8 files changed

+28
-31
lines changed

‎templates/android/build.gradle.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin'
22

33
// Top-level build file where you can add configuration options common to all sub-projects/modules.
44
buildscript {
5-
ext.kotlin_version = "1.4.31"
6-
version '{{ sdk.version }}'
5+
ext.kotlin_version = "1.5.31"
6+
version "{{ sdk.version }}"
77
repositories {
88
maven { url "https://plugins.gradle.org/m2/" }
99
google()
1010
mavenCentral()
1111
}
1212
dependencies {
13-
classpath "com.android.tools.build:gradle:4.2.0"
13+
classpath "com.android.tools.build:gradle:7.0.3"
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
1616

‎templates/android/example-java/build.gradle.twig‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ plugins {
33
}
44

55
android {
6-
compileSdkVersion 30
7-
buildToolsVersion "30.0.3"
6+
compileSdkVersion 31
87

98
defaultConfig {
109
applicationId "{{ sdk.namespace | caseDot }}.example_java"
1110
minSdkVersion 23
12-
targetSdkVersion 30
11+
targetSdkVersion 31
1312
versionCode 1
1413
versionName "1.0"
1514

@@ -29,8 +28,8 @@ android {
2928
}
3029

3130
dependencies {
32-
3331
implementation project(path: ':library')
32+
3433
implementation 'androidx.appcompat:appcompat:1.3.0'
3534
implementation 'com.google.android.material:material:1.3.0'
3635
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

‎templates/android/example-java/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/Theme.AppwriteAndroidSDK">
12-
<activity android:name=".MainActivity">
12+
<activity android:name=".MainActivity" android:exported="true">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />
1515

‎templates/android/example/build.gradle.twig‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdkVersion 30
8-
buildToolsVersion "30.0.3"
7+
compileSdkVersion 31
98

109
defaultConfig {
1110
applicationId "{{ sdk.namespace | caseDot }}.android"
1211
minSdkVersion 21
13-
targetSdkVersion 30
12+
targetSdkVersion 31
1413
versionCode 1
1514
versionName "1.0"
1615

@@ -37,23 +36,23 @@ android {
3736
}
3837

3938
dependencies {
40-
4139
implementation project(path: ':library')
40+
4241
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
43-
implementation 'androidx.core:core-ktx:1.5.0'
44-
implementation 'androidx.appcompat:appcompat:1.3.0'
45-
implementation 'com.google.android.material:material:1.3.0'
46-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
42+
implementation 'androidx.core:core-ktx:1.6.0'
43+
implementation 'androidx.appcompat:appcompat:1.3.1'
44+
implementation 'com.google.android.material:material:1.4.0'
45+
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
4746
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
48-
implementation "androidx.fragment:fragment-ktx:1.3.2"
47+
implementation "androidx.fragment:fragment-ktx:1.3.6"
4948
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
5049
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
5150
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
5251
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
5352
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
54-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
55-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3"
53+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
54+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
5655
testImplementation 'junit:junit:4.+'
57-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
58-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
56+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
57+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
5958
}

‎templates/android/example/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/Theme.AppwriteAndroidSDK">
12-
<activity android:name=".MainActivity">
12+
<activity android:name=".MainActivity" android:exported="true">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />
1515
<category android:name="android.intent.category.LAUNCHER" />
1616
</intent-filter>
1717
</activity>
1818

19-
<activity android:name="io.appwrite.views.CallbackActivity" >
19+
<activity android:name="io.appwrite.views.CallbackActivity" android:exported="true">
2020
<intent-filter android:label="android_web_auth">
2121
<action android:name="android.intent.action.VIEW" />
2222
<category android:name="android.intent.category.DEFAULT" />

‎templates/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
#Tue Jun 01 15:55:54 IST 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

‎templates/android/library/build.gradle.twig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import org.jetbrains.kotlin.config.KotlinCompilerVersion
21
plugins {
32
id("com.android.library")
43
id("kotlin-android")
@@ -21,11 +20,11 @@ ext {
2120
}
2221

2322
android {
24-
compileSdkVersion(30)
23+
compileSdkVersion(31)
2524

2625
defaultConfig {
2726
minSdkVersion(21)
28-
targetSdkVersion(30)
27+
targetSdkVersion(31)
2928
versionCode = 1
3029
versionName = "1.0"
3130
buildConfigField "String", "SDK_VERSION", "\"${PUBLISH_VERSION}\""
@@ -52,9 +51,9 @@ android {
5251
}
5352

5453
dependencies {
55-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${KotlinCompilerVersion.VERSION}")
56-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
57-
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
54+
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION}")
55+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
56+
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
5857

5958
api(platform("com.squareup.okhttp3:okhttp-bom:4.9.0"))
6059
api("com.squareup.okhttp3:okhttp")

‎tests/SDKTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class SDKTest extends TestCase
7777
'chmod +x tests/sdks/android/gradlew',
7878
],
7979
'envs' => [
80-
'java-8' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/android alvrme/alpine-android:latest-jdk8 sh -c "./gradlew :library:testReleaseUnitTest -q && cat library/result.txt"',
80+
'java-8' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/android alvrme/alpine-android:latest-jdk11 sh -c "./gradlew :library:testReleaseUnitTest -q && cat library/result.txt"',
8181
],
8282
'supportException' => false,
8383
'supportRealtime' => true,

0 commit comments

Comments
 (0)