Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ android {
includeAndroidResources = true
}
}

namespace 'com.amazonaws.amplify.amplify'
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<manifest package="com.amazonaws.amplify.amplify">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.amazonaws.amplify.amplify">
</manifest>
2 changes: 2 additions & 0 deletions packages/amplify_datastore/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ android {
includeAndroidResources = true
}
}

namespace 'com.amazonaws.amplify.amplify_datastore'
}

dependencies {
Expand Down
2 changes: 2 additions & 0 deletions packages/amplify_native_legacy_wrapper/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ android {
defaultConfig {
minSdkVersion 16
}

namespace 'com.amazonaws.amplify.amplify_native_legacy_wrapper'
}
dependencies {
implementation 'com.amazonaws:aws-android-sdk-mobile-client:2.65.0'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group 'com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint'
group 'com.amazonaws.amplify.amplify_analytics_pinpoint'
version '1.0-SNAPSHOT'

buildscript {
Expand Down Expand Up @@ -43,6 +43,8 @@ android {
defaultConfig {
minSdkVersion 23
}

namespace 'com.amazonaws.amplify.amplify_analytics_pinpoint'
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint">
package="com.amazonaws.amplify.amplify_analytics_pinpoint">
</manifest>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

package com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint
package com.amazonaws.amplify.amplify_analytics_pinpoint

import android.content.Context
import android.content.SharedPreferences
Expand Down Expand Up @@ -39,4 +39,4 @@ class AmplifyAnalyticsPinpointPlugin: FlutterPlugin, Messages.PigeonLegacyDataPr
result.success(sharedPrefs!!.getString(UNIQUE_ID_KEY, null))
}

}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ import 'package:pigeon/pigeon.dart';
dartOut:
'lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart',
javaOut:
'android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/Messages.java',
'android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java',
javaOptions: JavaOptions(
className: 'Messages',
package:
'com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint',
package: 'com.amazonaws.amplify.amplify_analytics_pinpoint',
),
copyrightHeader: 'pigeons/copyright.txt',
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ flutter:
plugin:
platforms:
android:
package: com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint
package: com.amazonaws.amplify.amplify_analytics_pinpoint
pluginClass: AmplifyAnalyticsPinpointPlugin
2 changes: 2 additions & 0 deletions packages/api/amplify_api_android/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}

namespace 'com.amazonaws.amplify.amplify_api'
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ android {
returnDefaultValues = true
}
}

namespace 'com.amazonaws.amplify.amplify_auth_cognito'
}

dependencies {
Expand Down
2 changes: 2 additions & 0 deletions packages/common/amplify_db_common/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ android {
defaultConfig {
minSdkVersion 16
}

namespace 'com.amazonaws.amplify.amplify_db_common'
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ android {
includeAndroidResources = true
}
}

namespace 'com.amazonaws.amplify.amplify_push_notifications'
}

// Logic for finding sibling plugins, from `flutter_tools/gradle/flutter.gradle`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group 'com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage'
group 'com.amazonaws.amplify.amplify_secure_storage'
version '1.0-SNAPSHOT'

buildscript {
Expand Down Expand Up @@ -45,6 +45,8 @@ android {
}

testOptions.unitTests.includeAndroidResources = true

namespace 'com.amazonaws.amplify.amplify_secure_storage'
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage">
package="com.amazonaws.amplify.amplify_secure_storage">
</manifest>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
package com.amazonaws.amplify.amplify_secure_storage

import android.content.Context

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
package com.amazonaws.amplify.amplify_secure_storage

import android.content.Context
import android.content.SharedPreferences
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
package com.amazonaws.amplify.amplify_secure_storage

interface KeyValueRepository {
fun put(dataKey: String, value: String?)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

package com.amazonaws.amplify.amplify_secure_storage

import android.content.Context
import android.content.Context.MODE_PRIVATE
Expand Down Expand Up @@ -77,4 +80,4 @@ class TestEncryptedKeyValueRepository(
override fun removeSharedPreferencesFile() {
context.getSharedPreferences("test", MODE_PRIVATE).edit().clear().commit()
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
package com.amazonaws.amplify.amplify_secure_storage

import java.io.InputStream
import java.io.OutputStream
Expand Down Expand Up @@ -67,4 +67,4 @@ object FakeAndroidKeyStore {
override fun engineInit(keysize: Int, random: SecureRandom?) = Unit
override fun engineGenerateKey(): SecretKey = wrapped.generateKey()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import 'package:pigeon/pigeon.dart';
PigeonOptions(
dartOut: 'lib/src/messages.android.g.dart',
javaOut:
'android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/Messages.java',
'android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/Messages.java',
javaOptions: JavaOptions(
className: 'Messages',
package:
'com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage',
package: 'com.amazonaws.amplify.amplify_secure_storage',
),
copyrightHeader: 'pigeons/copyright.txt',
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ flutter:
plugin:
platforms:
android:
package: com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
package: com.amazonaws.amplify.amplify_secure_storage
pluginClass: AmplifySecureStoragePlugin
ios:
pluginClass: AmplifySecureStoragePlugin
Expand Down