Skip to content

Commit

Permalink
v2.0.2-dev1
Browse files Browse the repository at this point in the history
  • Loading branch information
eggnstone committed Sep 20, 2021
1 parent c494925 commit f6c38e2
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 32 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Auto.generated
.DS_Store
.dart_tool/

Expand All @@ -7,3 +8,6 @@
build/
/temp
/pubspec.lock

# Manually added
.idea/*
2 changes: 0 additions & 2 deletions .idea/.gitignore

This file was deleted.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.0.2-dev1

* Android: Switched vom JCenter to MavenCentral.
* Android: Updated Gradle.
* Android: AAR: Switched plugin to use compileOnly() instead of implementation() to fix #23.

## 2.0.1

* Android: Removed amazon-chime-sdk-combined-without-libc++_shared.so.aar.
Expand Down
35 changes: 24 additions & 11 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
group 'dev.eggnstone.chime'
//noinspection GrPackage

group 'dev.eggnstone.eggnstone_amazon_chime'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.4.10'
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.6.4'
// Update gradle/wrapper/gradle-wrapper.properties according to
// https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
// https://services.gradle.org/distributions/
classpath 'com.android.tools.build:gradle:4.2.2'

classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

rootProject.allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand All @@ -27,22 +33,29 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 30

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}

defaultConfig {
minSdkVersion 21
}

lintOptions {
disable 'InvalidPackage'
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation "com.google.code.gson:gson:2.8.6" // required by Chime
implementation fileTree(dir: 'amazon-chime-sdk', include: ['amazon-chime-sdk.aar'])
implementation fileTree(dir: 'amazon-chime-sdk', include: ['amazon-chime-sdk-media.aar'])

compileOnly fileTree(dir: 'amazon-chime-sdk', include: ['amazon-chime-sdk.aar'])
compileOnly fileTree(dir: 'amazon-chime-sdk', include: ['amazon-chime-sdk-media.aar'])
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
21 changes: 15 additions & 6 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
Expand All @@ -28,17 +28,22 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 30

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

lintOptions {
disable 'InvalidPackage'
kotlinOptions {
jvmTarget = '1.8'
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "dev.eggnstone.chime_example"
applicationId "dev.eggnstone.eggnstone_amazon_chime_example"
minSdkVersion 21
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
Expand All @@ -65,4 +70,8 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

// TODO: explain
implementation fileTree(dir: '../../../android/amazon-chime-sdk', include: ['amazon-chime-sdk.aar'])
implementation fileTree(dir: '../../../android/amazon-chime-sdk', include: ['amazon-chime-sdk-media.aar'])
}
17 changes: 9 additions & 8 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
//noinspection GrPackage
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.4.10'
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.6.4'
// Update gradle/wrapper/gradle-wrapper.properties according to
// https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
// https://services.gradle.org/distributions/
classpath 'com.android.tools.build:gradle:4.2.2'

classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

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

rootProject.buildDir = '../build'

subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
}

subprojects {
project.evaluationDependsOn(':app')
}

Expand Down
3 changes: 1 addition & 2 deletions example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Jul 20 12:29:03 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
2 changes: 1 addition & 1 deletion example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ packages:
path: ".."
relative: true
source: path
version: "2.0.1"
version: "2.0.2-dev1"
fake_async:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: eggnstone_amazon_chime
copyright: 2020-2021 Mark Eggenstein
description: A wrapper for the Amazon Chime SDKs. Allows to join Chime meetings using audio and video.
homepage: https://github.com/eggnstone/eggnstone_amazon_chime
version: 2.0.1
version: 2.0.2-dev1

environment:
sdk: ">=2.12.0 <3.0.0"
Expand Down

0 comments on commit f6c38e2

Please sign in to comment.