diff --git a/examples/MagicWeather/app/build.gradle b/examples/MagicWeather/app/build.gradle deleted file mode 100644 index c41894da0e..0000000000 --- a/examples/MagicWeather/app/build.gradle +++ /dev/null @@ -1,65 +0,0 @@ -plugins { - alias libs.plugins.android.application - alias libs.plugins.kotlin.android -} - -android { - compileSdkVersion compileVersion - - defaultConfig { - applicationId "com.revenuecat.purchases_sample" - minSdkVersion 26 - targetSdkVersion compileVersion - versionCode rootProject.ext.get("versionCode").toInteger() - versionName rootProject.ext.get("versionName").toString() - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - flavorDimensions "store" - productFlavors { - amazon { - dimension "store" - buildConfigField "String", "STORE", "\"amazon\"" - } - - google { - dimension "store" - buildConfigField "String", "STORE", "\"google\"" - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } - buildFeatures { - buildConfig true - } - namespace 'com.revenuecat.sample' - -} - -dependencies { - implementation libs.revenuecat - implementation libs.revenuecat.amazon - implementation libs.kotlin.stdlib - implementation libs.androidx.core - implementation libs.androidx.appcompat - implementation libs.material - implementation libs.androidx.constraintlayout - implementation libs.androidx.lifecycle.livedata - implementation libs.androidx.lifecycle.viewmodel - implementation libs.androidx.navigation.fragment - implementation libs.androidx.navigation.ui -} diff --git a/examples/MagicWeather/app/build.gradle.kts b/examples/MagicWeather/app/build.gradle.kts new file mode 100644 index 0000000000..6443d6c5c3 --- /dev/null +++ b/examples/MagicWeather/app/build.gradle.kts @@ -0,0 +1,65 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) +} + +android { + val compileVersion = 34 + compileSdk = compileVersion + + defaultConfig { + applicationId = "com.revenuecat.purchases_sample" + minSdk = 26 + targetSdk = compileVersion + versionCode = rootProject.extra.get("versionCode")?.toString()?.toInt() + versionName = rootProject.extra.get("versionName")?.toString() + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + + flavorDimensions += "store" + productFlavors { + create("amazon") { + dimension = "store" + buildConfigField("String", "STORE", "\"amazon\"") + } + + create("google") { + dimension = "store" + buildConfigField("String", "STORE", "\"google\"") + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + buildConfig = true + } + namespace = "com.revenuecat.sample" +} + +dependencies { + implementation(libs.revenuecat) + implementation(libs.revenuecat.amazon) + implementation(libs.kotlin.stdlib) + implementation(libs.androidx.core) + implementation(libs.androidx.appcompat) + implementation(libs.material) + implementation(libs.androidx.constraintlayout) + implementation(libs.androidx.lifecycle.livedata) + implementation(libs.androidx.lifecycle.viewmodel) + implementation(libs.androidx.navigation.fragment) + implementation(libs.androidx.navigation.ui) +} diff --git a/examples/MagicWeather/app/proguard-rules.pro b/examples/MagicWeather/app/proguard-rules.pro index f7fd9afa89..f07a2c61ab 100644 --- a/examples/MagicWeather/app/proguard-rules.pro +++ b/examples/MagicWeather/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. +# proguardFiles setting in build.gradle.kts. # # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html @@ -20,4 +20,4 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --keep class com.revenuecat.purchases.** { *; } \ No newline at end of file +-keep class com.revenuecat.purchases.** { *; } diff --git a/examples/MagicWeather/build.gradle b/examples/MagicWeather/build.gradle deleted file mode 100644 index ed0a2a2fb1..0000000000 --- a/examples/MagicWeather/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - ext.compileVersion = 34 -} - -plugins { - alias libs.plugins.android.application apply false - alias libs.plugins.kotlin.android apply false -} - -allprojects { - repositories { - google() - mavenCentral() - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/examples/MagicWeather/build.gradle.kts b/examples/MagicWeather/build.gradle.kts new file mode 100644 index 0000000000..2b6f2e125b --- /dev/null +++ b/examples/MagicWeather/build.gradle.kts @@ -0,0 +1,17 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.android.application).apply(false) + alias(libs.plugins.kotlin.android).apply(false) +} + +allprojects { + repositories { + google() + mavenCentral() + maven(url = "https://oss.sonatype.org/content/repositories/snapshots") + } +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/examples/MagicWeather/settings.gradle b/examples/MagicWeather/settings.gradle deleted file mode 100644 index cf296e45e0..0000000000 --- a/examples/MagicWeather/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -pluginManagement { - repositories { - google() - gradlePluginPortal() - mavenCentral() - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } - } -} - -include ':app' -rootProject.name = "MagicWeatherKotlin" diff --git a/examples/MagicWeather/settings.gradle.kts b/examples/MagicWeather/settings.gradle.kts new file mode 100644 index 0000000000..496a42c78a --- /dev/null +++ b/examples/MagicWeather/settings.gradle.kts @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + google() + gradlePluginPortal() + mavenCentral() + maven(url = "https://oss.sonatype.org/content/repositories/snapshots") + } +} + +include(":app") +rootProject.name = "MagicWeatherKotlin" diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 0eed92abc7..410bc8d890 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -468,7 +468,7 @@ DESC # Application Id if new_application_id.to_s.size > 0 application_id = "com.revenuecat.purchases_sample" - sh("find ../#{project_dir}/app -name 'build.gradle' -type f -exec sed -i '' 's/#{application_id}/#{new_application_id}/' {} \\;") + sh("find ../#{project_dir}/app -name 'build.gradle.kts' -type f -exec sed -i '' 's/#{application_id}/#{new_application_id}/' {} \\;") end # Amazon pem