Skip to content

Commit

Permalink
Updated Archiving Kotlin to latest Android API, SDK and gradle configs
Browse files Browse the repository at this point in the history
  • Loading branch information
devwithzachary committed Apr 4, 2022
1 parent e438718 commit 72a5acc
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 33 deletions.
1 change: 0 additions & 1 deletion Archiving-Kotlin/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ apply {

android {
compileSdkVersion extCompileSdkVersion
buildToolsVersion extBuildToolsVersion

defaultConfig {
applicationId "com.tokbox.sample.archiving"
Expand Down
2 changes: 1 addition & 1 deletion Archiving-Kotlin/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<activity
android:name=".MainActivity"
android:screenOrientation="portrait"
android:label="@string/app_name" >
android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
37 changes: 7 additions & 30 deletions Archiving-Kotlin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = "1.5.20"

apply {
from '../commons.gradle'
}

repositories {
google()
mavenCentral()
}
dependencies {
// Dependency versions are defined in the ../commons.gradle file
classpath "com.android.tools.build:gradle:${extAgpVersion}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
plugins {
id 'com.android.application' version '7.1.2' apply false
id 'com.android.library' version '7.1.2' apply false
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
}

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

repositories {
mavenCentral()
}
task clean(type: Delete) {
delete rootProject.buildDir
}
1 change: 1 addition & 0 deletions Archiving-Kotlin/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx4096m

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
2 changes: 1 addition & 1 deletion Archiving-Kotlin/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
15 changes: 15 additions & 0 deletions Archiving-Kotlin/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}

include ':app'

0 comments on commit 72a5acc

Please sign in to comment.