Skip to content

Commit

Permalink
Merge pull request #57 from zeoflow/dev/kotlin
Browse files Browse the repository at this point in the history
Added `kotlin` modules
  • Loading branch information
teogor authored Jun 30, 2022
2 parents 881b506 + 1dea66e commit e5f0cbc
Show file tree
Hide file tree
Showing 344 changed files with 15,663 additions and 5,700 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github: [TeodorHMX1]
github: [teogor]
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Bug report
about: Create a report to help us improve
title: "[Component name] Short description of issue"
labels: '@bug'
assignees: 'TeodorHMX1'
assignees: 'teogor'

---

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Feature request
about: Suggest an idea for this project
title: "[Component name] Short description of request"
labels: '@feature'
assignees: 'TeodorHMX1'
assignees: 'teogor'

---

Expand Down
96 changes: 13 additions & 83 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,85 +1,15 @@
# Built application files
*.apk
*.aar
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml

# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore

# External native build folder generated in Android Studio 2.2 and later
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx/

# Google Services (e.g. APIs or Firebase)
# google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md

# Version control
vcs.xml

# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
.cxx
local.properties
2 changes: 1 addition & 1 deletion .idea/.name

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

30 changes: 29 additions & 1 deletion .idea/compiler.xml

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

28 changes: 28 additions & 0 deletions .idea/gradle.xml

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

35 changes: 0 additions & 35 deletions .idea/jarRepositories.xml

This file was deleted.

3 changes: 2 additions & 1 deletion .idea/misc.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

12 changes: 4 additions & 8 deletions .zeobot/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ zeobot:
# write down the users with access to restricted commands
listen_to:
users:
- TeodorHMX1
- Teogor
- teogor
# zeobot's features
features:
# if enabled, zeobot will post comments
Expand All @@ -36,11 +35,9 @@ auto_assign:
review_groups:
assignee_groups:
reviewers_to_add:
- TeodorHMX1
- Teogor
- teogor
assignees_to_add:
- TeodorHMX1
- Teogor
- teogor
skip_keywords:

# Autodelete Merged Branches (AMB)
Expand Down Expand Up @@ -77,8 +74,7 @@ enforce_branch_merge:
- main
# who has the right to write to protected branches
give_access_to:
- TeodorHMX1
- Teogor
- teogor

# License Checker (LC)
# branches that contains files without license will not be merged
Expand Down
2 changes: 1 addition & 1 deletion .zeobot/contributors.src
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"repoHost": "https://github.com",
"contributors": [
{
"login": "TeodorHMX1",
"login": "teogor",
"name": "Teodor G.",
"avatar_url": "https://avatars.githubusercontent.com/u/22307006?v=4",
"profile": "http://team.zeoflow.com/teodor_g",
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ dependencies {
def memo_version = "x.y.z"
// Memo Library
implementation("com.zeoflow:memo:$memo_version")
implementation("com.zeoflow.memo:memo:$memo_version")
// Required if you want to use the injector
implementation("com.zeoflow:memo-annotation:$memo_version")
annotationProcessor("com.zeoflow:memo-compiler:$memo_version")
implementation("com.zeoflow.memo:memo-runtime:$memo_version")
annotationProcessor("com.zeoflow.memo:memo-compiler:$memo_version")
// For kotlin projects use kapt instead of annotationProcessor
kapt("com.zeoflow:memo-compiler:$memo_version")
kapt("com.zeoflow.memo:memo-compiler-ktx:$memo_version")
// ...
}
Expand Down Expand Up @@ -315,7 +315,7 @@ component.userProfile().usernameObserver((LifecycleOwner) this, new Observer<Str
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<p float="left">
<a href="docs/contributors.md#pushpin-teodor-g-teodorhmx1"><img width="100" src="https://avatars.githubusercontent.com/u/22307006?v=4" hspace=5 title='Teodor G. (@TeodorHMX1) - click for details about the contributions'></a>
<a href="docs/contributors.md#pushpin-teodor-g-teogor"><img width="100" src="https://avatars.githubusercontent.com/u/22307006?v=4" hspace=5 title='Teodor G. (@teogor) - click for details about the contributions'></a>
</p>

<!-- markdownlint-enable -->
Expand Down
1 change: 1 addition & 0 deletions app-java/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
39 changes: 39 additions & 0 deletions app-java/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
plugins {
id 'com.android.application'
}

android {
namespace 'com.zeoflow.memo.demo'
compileSdk 32

defaultConfig {
applicationId "com.zeoflow.memo.demo"
minSdk 21
targetSdk 32
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
implementation(project(":memo"))
implementation(project(":memo-runtime"))
annotationProcessor annotationProcessor(project(':memo-compiler',))

implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
}
8 changes: 3 additions & 5 deletions demo/proguard-rules.pro → app-java/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class value to the JavaScript interface
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
Expand All @@ -17,7 +17,5 @@
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file value.
#-renamesourcefileattribute SourceFile

-keep public class * implements com.zeoflow.memo.annotation.IMemoStorageImpl { *; }
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Loading

0 comments on commit e5f0cbc

Please sign in to comment.