feat(terminal): remove kotlin settings from demo

capacitor-community · Dec 5, 2024 · ac1abdb · ac1abdb
1 parent 9c55d7f
commit ac1abdb
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 18 deletions.
diff --git a/demo/angular/android/app/build.gradle b/demo/angular/android/app/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 
 android {
     namespace "io.ionic.starter"
@@ -34,7 +32,6 @@ repositories {
     flatDir{
         dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
     }
-    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
@@ -47,16 +44,6 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation project(':capacitor-cordova-android-plugins')
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
-    implementation "androidx.core:core-ktx:1.6.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 apply from: 'capacitor.build.gradle'

diff --git a/demo/angular/android/build.gradle b/demo/angular/android/build.gradle
@@ -1,16 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '2.0.+'
-
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.2.1'
         classpath 'com.google.gms:google-services:4.4.0'
-        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

diff --git a/demo/angular/android/variables.gradle b/demo/angular/android/variables.gradle
@@ -13,7 +13,6 @@ ext {
     androidxJunitVersion = '1.1.5'
     androidxEspressoCoreVersion = '3.5.1'
     cordovaAndroidVersion = '10.1.1'
-    kotlin_version= '1.8.10'
 
     // If you use @capacitor-community/stripe:
     // stripeAndroidVersion = '20.39.+'

diff --git a/packages/terminal/android/build.gradle b/packages/terminal/android/build.gradle
@@ -11,7 +11,7 @@ ext {
 }
 
 buildscript {
-    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '20.0.+'
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.0.+'
     repositories {
         google()
         mavenCentral()