Skip to content

Commit

Permalink
Merge pull request #77 from zeoflow/fix-file-tree-api
Browse files Browse the repository at this point in the history
Fixed api fileTree error
  • Loading branch information
teogor authored Jun 15, 2021
2 parents 827c856 + 24dd1da commit 4e32614
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
16 changes: 5 additions & 11 deletions flow-kit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,15 @@ configurations.all {
}

dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'com.zeoflow:zson:1.3.0'
implementation 'com.zeoflow:material-elements:2.4.1'
implementation 'com.zeoflow:material-elements:2.4.4'
implementation 'com.zeoflow:stylar:1.1.0'

// todo remove this
api 'com.facebook.conceal:conceal:1.1.3@aar'

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.fragment:fragment:1.3.2'

// todo remove this
implementation 'androidx.security:security-crypto:1.1.0-alpha03'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.fragment:fragment:1.3.4'

implementation("com.google.guava:guava:30.0-android")
implementation("com.google.crypto.tink:tink-android:1.5.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public static List<ZeoFlowApp> getApps(@NonNull Context context)
}
}

@Deprecated
@NonNull
public static ZeoFlowApp getInstance()
{
Expand All @@ -85,6 +86,7 @@ public static ZeoFlowApp getInstance()
}
}

@Deprecated
@NonNull
public static Context getContext()
{
Expand All @@ -104,6 +106,7 @@ public static Context getContext()
}
}

@Deprecated
@NonNull
public static ZeoFlowApp getInstance(@NonNull String name)
{
Expand Down Expand Up @@ -132,6 +135,7 @@ public static ZeoFlowApp getInstance(@NonNull String name)
}
}

@Deprecated
public static ZeoFlowApp initializeApp(@NonNull Context context)
{
String normalizedName = normalize(DEFAULT_APP_NAME);
Expand All @@ -156,6 +160,7 @@ public static ZeoFlowApp initializeApp(@NonNull Context context)
return zeoflowApp;
}

@Deprecated
@NonNull
public static ZeoFlowApp initializeApp(@NonNull Context context, @NonNull ZeoFlowOptions options)
{
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ android.enableJetifier=true
POM_NAME=FlowKit
POM_ARTIFACT_ID=flow-kit
POM_PACKAGING=aar
VERSION_NAME=1.5.2
VERSION_NAME=1.6.0
GROUP=com.zeoflow
POM_DESCRIPTION=An Android Library that comes with useful features and components
POM_URL=https://github.com/zeoflow/flow-kit
Expand Down

0 comments on commit 4e32614

Please sign in to comment.