-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ANDROID-455 Client SDK: Target Android 14 (#91)
- Loading branch information
1 parent
48c8e8c
commit ba31e6a
Showing
20 changed files
with
230 additions
and
263 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
zello-sdk-sample-contacts/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Mon May 01 15:52:58 CDT 2023 | ||
| #Fri Sep 08 15:53:50 CDT 2023 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,58 @@ | ||
| buildscript { | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath "com.android.tools.build:gradle:8.0.0" | ||
| } | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath "com.android.tools.build:gradle:8.1.1" | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| apply plugin: "com.android.application" | ||
|
|
||
| java { | ||
| toolchain { | ||
| languageVersion.set(JavaLanguageVersion.of(17)) | ||
| } | ||
| toolchain { | ||
| languageVersion.set(JavaLanguageVersion.of(17)) | ||
| } | ||
| } | ||
|
|
||
| android { | ||
| compileSdkVersion 33 | ||
| buildToolsVersion "33.0.0" | ||
| namespace "com.zello.sdk.sample.misc" | ||
|
|
||
| buildFeatures { | ||
| buildConfig true | ||
| } | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.zello.sdk.sample.miscellaneous" | ||
| minSdkVersion 23 | ||
| targetSdkVersion 33 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_17 | ||
| targetCompatibility JavaVersion.VERSION_17 | ||
| } | ||
| compileSdk 34 | ||
| setBuildToolsVersion("33.0.1") | ||
| namespace "com.zello.sdk.sample.misc" | ||
|
|
||
| buildFeatures { | ||
| buildConfig true | ||
| } | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.zello.sdk.sample.miscellaneous" | ||
| minSdk 23 | ||
| targetSdk 34 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_17 | ||
| targetCompatibility JavaVersion.VERSION_17 | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation files("libs/zello-sdk.aar") | ||
| implementation "androidx.appcompat:appcompat:1.6.1" | ||
| implementation files("libs/zello-sdk.aar") | ||
| implementation "androidx.appcompat:appcompat:1.6.1" | ||
| } |
4 changes: 2 additions & 2 deletions
4
zello-sdk-sample-misc/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Mon May 01 15:52:58 CDT 2023 | ||
| #Fri Sep 08 15:53:50 CDT 2023 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,58 @@ | ||
| buildscript { | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath "com.android.tools.build:gradle:8.0.0" | ||
| } | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath "com.android.tools.build:gradle:8.1.1" | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| apply plugin: "com.android.application" | ||
|
|
||
| java { | ||
| toolchain { | ||
| languageVersion.set(JavaLanguageVersion.of(17)) | ||
| } | ||
| toolchain { | ||
| languageVersion.set(JavaLanguageVersion.of(17)) | ||
| } | ||
| } | ||
|
|
||
| android { | ||
| compileSdkVersion 33 | ||
| buildToolsVersion "33.0.0" | ||
| namespace "com.zello.sdk.sample.ptt" | ||
|
|
||
| buildFeatures { | ||
| buildConfig true | ||
| } | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.zello.sdk.sample.ptt" | ||
| minSdkVersion 23 | ||
| targetSdkVersion 33 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_17 | ||
| targetCompatibility JavaVersion.VERSION_17 | ||
| } | ||
| compileSdk 34 | ||
| setBuildToolsVersion("33.0.1") | ||
| namespace "com.zello.sdk.sample.ptt" | ||
|
|
||
| buildFeatures { | ||
| buildConfig true | ||
| } | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.zello.sdk.sample.ptt" | ||
| minSdk 23 | ||
| targetSdk 34 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_17 | ||
| targetCompatibility JavaVersion.VERSION_17 | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation files("libs/zello-sdk.aar") | ||
| implementation "androidx.appcompat:appcompat:1.6.1" | ||
| implementation files("libs/zello-sdk.aar") | ||
| implementation "androidx.appcompat:appcompat:1.6.1" | ||
| } |
4 changes: 2 additions & 2 deletions
4
zello-sdk-sample-ptt/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Mon May 01 15:52:58 CDT 2023 | ||
| #Fri Sep 08 15:53:50 CDT 2023 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,54 @@ | ||
| buildscript { | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath "com.android.tools.build:gradle:8.0.0" | ||
| } | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath "com.android.tools.build:gradle:8.1.1" | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| apply plugin: "com.android.application" | ||
|
|
||
| java { | ||
| toolchain { | ||
| languageVersion.set(JavaLanguageVersion.of(17)) | ||
| } | ||
| toolchain { | ||
| languageVersion.set(JavaLanguageVersion.of(17)) | ||
| } | ||
| } | ||
|
|
||
| android { | ||
| compileSdkVersion 33 | ||
| buildToolsVersion "33.0.0" | ||
| namespace "com.zello.sdk.sample.signin" | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.zello.sdk.sample" | ||
| minSdkVersion 23 | ||
| targetSdkVersion 33 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_17 | ||
| targetCompatibility JavaVersion.VERSION_17 | ||
| } | ||
| compileSdk 34 | ||
| setBuildToolsVersion("33.0.1") | ||
| namespace "com.zello.sdk.sample.signin" | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.zello.sdk.sample" | ||
| minSdk 23 | ||
| targetSdk 34 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_17 | ||
| targetCompatibility JavaVersion.VERSION_17 | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation files("libs/zello-sdk.aar") | ||
| implementation "androidx.appcompat:appcompat:1.6.1" | ||
| implementation files("libs/zello-sdk.aar") | ||
| implementation "androidx.appcompat:appcompat:1.6.1" | ||
| } |
4 changes: 2 additions & 2 deletions
4
zello-sdk-sample-signin/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Mon May 01 15:52:58 CDT 2023 | ||
| #Fri Sep 08 15:53:50 CDT 2023 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Binary file not shown.
Oops, something went wrong.