Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ detekt {


android {
namespace 'com.extole.androidsdk'
compileSdkVersion 33
buildToolsVersion "30.0.3"

lint {
abortOnError false
}

defaultConfig {
applicationId "com.extole"
Expand All @@ -45,11 +49,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '11'
}
buildFeatures {
viewBinding true
Expand All @@ -63,8 +67,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.4.0'
detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1"
implementation "com.google.dagger:hilt-android:2.44"
kapt "com.google.dagger:hilt-compiler:2.44"
implementation "com.google.dagger:hilt-android:2.57.2"
kapt "com.google.dagger:hilt-compiler:2.57.2"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.4.0'
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/extole/androidsdk/Configuration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
class Configuration {
val threadPool = Executors.newFixedThreadPool(1);
val threadPool = Executors.newFixedThreadPool(1)

@Singleton
@Provides
Expand All @@ -29,5 +29,4 @@ class Configuration {
threadPool.submit(extoleFuture)
return extoleFuture
}

}
5 changes: 0 additions & 5 deletions app/src/main/java/com/extole/androidsdk/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ class MainActivity : AppCompatActivity() {
// example 1
val extole = initExtole(this@MainActivity)

// example 2
val extole2 = withContext(Dispatchers.IO) {
extoleFuture.get()
}

val (zone, campaign) = extole.fetchZone("mobile_cta")
runOnUiThread {
findViewById<Button>(R.id.menu_item).setText(
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
classpath 'com.android.tools.build:gradle:8.4.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

plugins {
id("com.google.dagger.hilt.android") version "2.44" apply false
id("com.google.dagger.hilt.android") version "2.57.2" apply false
}

task clean(type: Delete) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Aug 20 18:08:30 EEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME